@danielx/civet 0.8.8 → 0.8.9

package/dist/main.mjs

@@ -56,7 +56,7 @@ var require_machine = __commonJS({
       $EVENT: () => $EVENT2,
       $EVENT_C: () => $EVENT_C2,
       $EXPECT: () => $EXPECT2,
-      $L: () => $L239,
+      $L: () => $L246,
       $N: () => $N2,
       $P: () => $P2,
       $Q: () => $Q2,
@@ -81,7 +81,7 @@ var require_machine = __commonJS({
         return result;
       };
     }
-    function $L239(str) {
+    function $L246(str) {
       return function(_ctx, state2) {
         const { input, pos } = state2, { length } = str, end = pos + length;
         if (input.substring(pos, end) === str) {
@@ -556,7 +556,8 @@ __export(lib_exports, {
   stripTrailingImplicitComma: () => stripTrailingImplicitComma,
   trimFirstSpace: () => trimFirstSpace,
   typeOfJSX: () => typeOfJSX,
-  wrapIIFE: () => wrapIIFE
+  wrapIIFE: () => wrapIIFE,
+  wrapTypeInPromise: () => wrapTypeInPromise
 });
 
 // source/parser/util.civet
@@ -896,32 +897,54 @@ function literalValue(literal) {
     case "false":
       return false;
   }
-  if (raw.startsWith('"') && raw.endsWith('"') || raw.startsWith("'") && raw.endsWith("'")) {
-    return raw.slice(1, -1);
-  }
-  const numeric = literal.children.find(
-    (child) => child.type === "NumericLiteral"
-  );
-  if (numeric) {
-    raw = raw.replace(/_/g, "");
-    const { token } = numeric;
-    if (token.endsWith("n")) {
-      return BigInt(raw.slice(0, -1));
-    } else if (token.match(/[\.eE]/)) {
-      return parseFloat(raw);
-    } else if (token.startsWith("0")) {
-      switch (token.charAt(1).toLowerCase()) {
-        case "x":
-          return parseInt(raw.replace(/0[xX]/, ""), 16);
-        case "b":
-          return parseInt(raw.replace(/0[bB]/, ""), 2);
-        case "o":
-          return parseInt(raw.replace(/0[oO]/, ""), 8);
+  let ref3;
+  switch (literal.subtype) {
+    case "StringLiteral": {
+      assert.equal(
+        raw.startsWith('"') && raw.endsWith('"') || raw.startsWith("'") && raw.endsWith("'"),
+        true,
+        "String literal should begin and end in single or double quotes"
+      );
+      return raw.slice(1, -1);
+    }
+    case "NumericLiteral": {
+      raw = raw.replace(/_/g, "");
+      if (raw.endsWith("n")) {
+        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;
+        switch (base.toLowerCase()) {
+          case "x":
+            return parseInt(raw.replace(/0[xX]/, ""), 16);
+          case "b":
+            return parseInt(raw.replace(/0[bB]/, ""), 2);
+          case "o":
+            return parseInt(raw.replace(/0[oO]/, ""), 8);
+        }
       }
+      return parseInt(raw, 10);
+    }
+    default: {
+      throw new Error("Unrecognized literal " + JSON.stringify(literal));
     }
-    return parseInt(raw, 10);
   }
-  throw new Error("Unrecognized literal " + JSON.stringify(literal));
+}
+function makeNumericLiteral(n) {
+  const s = n.toString();
+  return {
+    type: "Literal",
+    subtype: "NumericLiteral",
+    raw: s,
+    children: [
+      {
+        type: "NumericLiteral",
+        token: s
+      }
+      // missing $loc
+    ]
+  };
 }
 function startsWith(target, value) {
   if (!target)
@@ -982,21 +1005,39 @@ function hasImportDeclaration(exp) {
 function hasExportDeclaration(exp) {
   return gatherRecursiveWithinFunction(exp, ($4) => $4.type === "ExportDeclaration").length > 0;
 }
-function deepCopy(node) {
-  if (node == null)
-    return node;
-  if (typeof node !== "object")
-    return node;
-  if (Array.isArray(node)) {
-    return node.map(deepCopy);
+function deepCopy(root) {
+  const copied = /* @__PURE__ */ new Map();
+  return recurse(root);
+  function recurse(node) {
+    if (!(node != null && typeof node === "object")) {
+      return node;
+    }
+    if (!copied.has(node)) {
+      if (Array.isArray(node)) {
+        const array = new Array(node.length);
+        copied.set(node, array);
+        for (let i4 = 0, len4 = node.length; i4 < len4; i4++) {
+          const i = i4;
+          const item = node[i4];
+          array[i] = recurse(item);
+        }
+      } else if (node?.type === "Ref") {
+        copied.set(node, node);
+      } else {
+        const obj = {};
+        copied.set(node, obj);
+        for (const key in node) {
+          const value = node[key];
+          if (key === "parent") {
+            obj.parent = copied.get(value) ?? value;
+          } else {
+            obj[key] = recurse(value);
+          }
+        }
+      }
+    }
+    return copied.get(node);
   }
-  if (node?.type === "Ref")
-    return node;
-  return Object.fromEntries(
-    Object.entries(node).map(([key, value]) => {
-      return [key, deepCopy(value)];
-    })
-  );
 }
 function removeHoistDecs(node) {
   if (node == null)
@@ -1070,8 +1111,8 @@ function updateParentPointers(node, parent, depth = 1) {
     return;
   }
   if (Array.isArray(node)) {
-    for (let i4 = 0, len4 = node.length; i4 < len4; i4++) {
-      const child = node[i4];
+    for (let i5 = 0, len5 = node.length; i5 < len5; i5++) {
+      const child = node[i5];
       updateParentPointers(child, parent, depth);
     }
     return;
@@ -1081,8 +1122,8 @@ function updateParentPointers(node, parent, depth = 1) {
     node.parent = parent;
   }
   if (depth && isParent(node)) {
-    for (let ref3 = node.children, i5 = 0, len5 = ref3.length; i5 < len5; i5++) {
-      const child = ref3[i5];
+    for (let ref4 = node.children, i6 = 0, len6 = ref4.length; i6 < len6; i6++) {
+      const child = ref4[i6];
       updateParentPointers(child, node, depth - 1);
     }
   }
@@ -1119,7 +1160,7 @@ function spliceChild(node, child, del, ...replacements) {
   return children.splice(index, del, ...replacements);
 }
 function convertOptionalType(suffix) {
-  if (suffix.t.type === "AssertsType") {
+  if (suffix.t.type === "TypeAsserts") {
     spliceChild(suffix, suffix.optional, 1, suffix.optional = {
       type: "Error",
       message: "Can't use optional ?: syntax with asserts type"
@@ -1141,7 +1182,7 @@ var typeNeedsNoParens = /* @__PURE__ */ new Set([
   "TypeIdentifier",
   "ImportType",
   "TypeLiteral",
-  "TupleType",
+  "TypeTuple",
   "TypeParenthesized"
 ]);
 function parenthesizeType(type) {
@@ -1219,8 +1260,8 @@ function wrapIIFE(expressions, asyncFlag, generator) {
       children.splice(1, 0, ".bind(this)");
     }
     if (gatherRecursiveWithinFunction(block, (a2) => typeof a2 === "object" && a2 != null && "token" in a2 && a2.token === "arguments").length) {
-      let ref4;
-      children[children.length - 1] = (ref4 = parameters.children)[ref4.length - 1] = "(arguments)";
+      let ref5;
+      children[children.length - 1] = (ref5 = parameters.children)[ref5.length - 1] = "(arguments)";
     }
   }
   let exp = makeNode({
@@ -1258,9 +1299,9 @@ function wrapWithReturn(expression) {
 }
 function flatJoin(array, separator) {
   const result = [];
-  for (let i6 = 0, len6 = array.length; i6 < len6; i6++) {
-    const i = i6;
-    const items = array[i6];
+  for (let i7 = 0, len7 = array.length; i7 < len7; i7++) {
+    const i = i7;
+    const items = array[i7];
     if (i) {
       result.push(separator);
     }
@@ -1831,6 +1872,13 @@ var declareHelper = {
       ").push(rhs), lhs);\n"
     ]]);
   },
+  AutoPromise(ref) {
+    state.prelude.push([
+      "",
+      ts(["type ", ref, "<T> = T extends Promise<unknown> ? T : Promise<T>"]),
+      ";\n"
+    ]);
+  },
   JSX(jsxRef) {
     state.prelude.push([
       "",
@@ -1936,12 +1984,17 @@ function gen(root, options) {
         ));
         return "";
       }
-      if (node.$loc != null) {
+      if ("$loc" in node) {
         const { token, $loc } = node;
-        updateSourceMap?.(token, $loc.pos);
+        if ($loc != null) {
+          updateSourceMap?.(token, $loc.pos);
+        }
         return token;
       }
       if (!node.children) {
+        if (node.token != null) {
+          return node.token;
+        }
         switch (node.type) {
           case "Ref": {
             throw new Error(`Unpopulated ref ${stringify(node)}`);
@@ -2319,9 +2372,49 @@ function getTypeArguments(args) {
 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";
 }
+function isPromiseType(t) {
+  return typeof t === "object" && t != null && "type" in t && t.type === "TypeIdentifier" && "raw" in t && t.raw === "Promise";
+}
 function isPromiseVoidType(t) {
-  let args;
-  return typeof t === "object" && t != null && "type" in t && t.type === "TypeIdentifier" && "raw" in t && t.raw === "Promise" && (args = getTypeArguments(t.args?.args)).length === 1 && isVoidType(args[0].t);
+  if (!isPromiseType(t)) {
+    return false;
+  }
+  const args = getTypeArguments(t.args?.args);
+  return args.length === 1 && isVoidType(args[0].t);
+}
+function wrapTypeInPromise(t) {
+  if (isPromiseType(t)) {
+    return t;
+  }
+  return wrapTypeInApplication(t, getHelperRef("AutoPromise"), "Promise");
+}
+function wrapTypeInApplication(t, id, raw) {
+  const ws = getTrimmingSpace(t);
+  t = trimFirstSpace(t);
+  const innerArgs = [{
+    type: "TypeArgument",
+    ts: true,
+    t,
+    children: [t]
+  }];
+  const args = {
+    type: "TypeArguments",
+    ts: true,
+    args: innerArgs,
+    children: ["<", innerArgs, ">"]
+  };
+  if (!(raw != null)) {
+    if (!(typeof id === "string")) {
+      throw new Error("wrapTypeInApplication requires string id or raw argument");
+    }
+    raw = id;
+  }
+  return {
+    type: "TypeIdentifier",
+    raw,
+    args,
+    children: [ws, id, args]
+  };
 }
 function implicitFunctionBlock(f) {
   if (f.abstract || f.block || f.signature?.optional)
@@ -2382,7 +2475,8 @@ function processReturnValue(func) {
   }
   const ref = makeRef("ret");
   let declaration;
-  values.forEach((value) => {
+  for (let i1 = 0, len3 = values.length; i1 < len3; i1++) {
+    const value = values[i1];
     value.children = [ref];
     const { ancestor, child } = findAncestor(
       value,
@@ -2390,21 +2484,41 @@ function processReturnValue(func) {
       isFunction
     );
     if (ancestor) {
-      return declaration ??= child;
+      declaration ??= child;
     }
-    ;
-    return;
-  });
+  }
   let returnType = func.returnType ?? func.signature?.returnType;
   if (returnType) {
     const { t } = returnType;
     let m;
     if (m = t.type, m === "TypePredicate") {
-      returnType = ": boolean";
-    } else if (m === "AssertsType") {
+      const token = { token: "boolean" };
+      const literal = {
+        type: "TypeLiteral",
+        t: token,
+        children: [token]
+      };
+      returnType = {
+        type: "ReturnTypeAnnotation",
+        ts: true,
+        t: literal,
+        children: [": ", literal]
+      };
+    } else if (m === "TypeAsserts") {
       returnType = void 0;
     }
   }
+  if (returnType) {
+    returnType = deepCopy(returnType);
+    addParentPointers(returnType);
+    if (func.signature.modifier.async) {
+      replaceNode(
+        returnType.t,
+        makeNode(wrapTypeInApplication(returnType.t, "Awaited")),
+        returnType
+      );
+    }
+  }
   if (declaration) {
     if (!(declaration.typeSuffix != null)) {
       declaration.children[1] = declaration.typeSuffix = returnType;
@@ -2412,11 +2526,11 @@ function processReturnValue(func) {
   } else {
     block.expressions.unshift([
       getIndent(block.expressions[0]),
-      {
+      makeNode({
         type: "Declaration",
         children: ["let ", ref, returnType],
         names: []
-      },
+      }),
       ";"
     ]);
   }
@@ -2834,19 +2948,15 @@ function wrapIterationReturningResults(statement, collect) {
     "wrapIterationReturningResults should not be called twice on the same statement"
   );
   const resultsRef = statement.resultsRef = makeRef("results");
-  const { declaration, breakWithOnly } = iterationDeclaration(statement);
+  const declaration = iterationDeclaration(statement);
   const { ancestor, child } = findAncestor(statement, ($4) => $4.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`);
   const iterationTuple = ancestor.expressions[index];
   ancestor.expressions.splice(index, 0, [iterationTuple[0], declaration, ";"]);
   iterationTuple[0] = "";
   braceBlock(ancestor);
-  if (!breakWithOnly) {
-    assignResults(statement.block, (node) => {
-      return [resultsRef, ".push(", node, ")"];
-    });
-  }
   if (collect) {
     statement.children.push(collect(resultsRef));
   } else {
@@ -2854,15 +2964,16 @@ function wrapIterationReturningResults(statement, collect) {
   }
 }
 function iterationDeclaration(statement) {
-  const { resultsRef } = statement;
-  let decl = "const";
+  const { resultsRef, block } = statement;
+  const reduction = statement.type === "ForStatement" && statement.reduction;
+  let decl = reduction ? "let" : "const";
   if (statement.type === "IterationStatement" || statement.type === "ForStatement") {
     if (processBreakContinueWith(statement)) {
       decl = "let";
     }
   }
   const breakWithOnly = decl === "let" && isLoopStatement(statement) && gatherRecursive(
-    statement.block,
+    block,
     (s) => s.type === "BreakStatement" && !s.with,
     (s) => isFunction(s) || s.type === "IterationStatement"
   ).length === 0;
@@ -2873,14 +2984,124 @@ function iterationDeclaration(statement) {
     names: [],
     bindings: []
   };
-  if (decl === "const") {
-    declaration.children.push("=[]");
+  if (reduction) {
+    declaration.children.push("=" + (() => {
+      switch (reduction.subtype) {
+        case "some": {
+          return "false";
+        }
+        case "every": {
+          return "true";
+        }
+        case "min": {
+          return "Infinity";
+        }
+        case "max": {
+          return "-Infinity";
+        }
+        case "product": {
+          return "1";
+        }
+        default: {
+          return "0";
+        }
+      }
+    })());
   } else {
-    if (!breakWithOnly) {
-      declaration.children.push(";", resultsRef, "=[]");
+    if (decl === "const") {
+      declaration.children.push("=[]");
+    } else {
+      if (!breakWithOnly) {
+        declaration.children.push(";", resultsRef, "=[]");
+      }
+    }
+  }
+  if (!breakWithOnly) {
+    if (iterationDefaultBody(statement)) {
+      return declaration;
+    }
+    if (!block.empty) {
+      assignResults(block, (node) => {
+        if (!reduction) {
+          return [resultsRef, ".push(", node, ")"];
+        }
+        switch (reduction.subtype) {
+          case "some": {
+            return ["if (", node, ") {", resultsRef, " = true; break}"];
+          }
+          case "every": {
+            return [
+              "if (!",
+              makeLeftHandSideExpression(node),
+              ") {",
+              resultsRef,
+              " = false; break}"
+            ];
+          }
+          case "count": {
+            return ["if (", node, ") ++", resultsRef];
+          }
+          case "sum": {
+            return [resultsRef, " += ", node];
+          }
+          case "product": {
+            return [resultsRef, " *= ", node];
+          }
+          case "min": {
+            return [resultsRef, " = Math.min(", resultsRef, ", ", node, ")"];
+          }
+          case "max": {
+            return [resultsRef, " = Math.max(", resultsRef, ", ", node, ")"];
+          }
+        }
+      });
     }
   }
-  return { declaration, breakWithOnly };
+  return declaration;
+}
+function iterationDefaultBody(statement) {
+  const { block, resultsRef } = statement;
+  if (!block.empty) {
+    return false;
+  }
+  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) {
+      block.expressions.pop();
+    }
+    block.expressions.push(expression);
+    block.empty = false;
+    return braceBlock(block);
+  }
+  if (reduction) {
+    switch (reduction.subtype) {
+      case "some": {
+        fillBlock(["", [resultsRef, " = true; break"]]);
+        block.empty = false;
+        braceBlock(block);
+        return true;
+      }
+      case "every": {
+        fillBlock(["", [resultsRef, " = false; break"]]);
+        block.empty = false;
+        braceBlock(block);
+        return true;
+      }
+      case "count": {
+        fillBlock(["", ["++", resultsRef]]);
+        block.empty = false;
+        braceBlock(block);
+        return true;
+      }
+    }
+  }
+  if (statement.type === "ForStatement" && statement.declaration?.type === "ForDeclaration") {
+    fillBlock(["", patternAsValue(statement.declaration.binding)]);
+    block.empty = false;
+  }
+  return false;
 }
 function processParams(f) {
   const { type, parameters, block } = f;
@@ -2911,18 +3132,18 @@ function processParams(f) {
       const classExpressions = ancestor.body.expressions;
       let index = findChildIndex(classExpressions, f);
       assert.notEqual(index, -1, "Could not find constructor in class");
-      let m2;
-      while (m2 = classExpressions[index - 1]?.[1], typeof m2 === "object" && m2 != null && "type" in m2 && m2.type === "MethodDefinition" && "name" in m2 && m2.name === "constructor") {
+      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") {
         index--;
       }
       const fStatement = classExpressions[index];
-      for (let ref8 = gatherRecursive(parameters, ($9) => $9.type === "Parameter"), i1 = 0, len3 = ref8.length; i1 < len3; i1++) {
-        const parameter = ref8[i1];
+      for (let ref9 = gatherRecursive(parameters, ($9) => $9.type === "Parameter"), i2 = 0, len1 = ref9.length; i2 < len1; i2++) {
+        const parameter = ref9[i2];
         if (!parameter.typeSuffix) {
           continue;
         }
-        for (let ref9 = gatherRecursive(parameter, ($10) => $10.type === "AtBinding"), i2 = 0, len1 = ref9.length; i2 < len1; i2++) {
-          const binding = ref9[i2];
+        for (let ref10 = gatherRecursive(parameter, ($10) => $10.type === "AtBinding"), i3 = 0, len22 = ref10.length; i3 < len22; i3++) {
+          const binding = ref10[i3];
           const typeSuffix = binding.parent?.typeSuffix;
           if (!typeSuffix) {
             continue;
@@ -2976,11 +3197,11 @@ function processParams(f) {
 }
 function processSignature(f) {
   const { block, signature } = f;
-  if (hasAwait(block) && !f.async?.length) {
+  if (!f.async?.length && hasAwait(block)) {
     f.async.push("async ");
     signature.modifier.async = true;
   }
-  if (hasYield(block) && !f.generator?.length) {
+  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");
@@ -2994,21 +3215,26 @@ function processSignature(f) {
       signature.modifier.generator = true;
     }
   }
+  if (signature.modifier.async && !signature.modifier.generator && signature.returnType && !isPromiseType(signature.returnType.t)) {
+    replaceNode(signature.returnType.t, wrapTypeInPromise(signature.returnType.t));
+  }
 }
 function processFunctions(statements, config2) {
-  gatherRecursiveAll(statements, ({ type }) => type === "FunctionExpression" || type === "ArrowFunction").forEach((f) => {
+  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") {
       implicitFunctionBlock(f);
     }
     processSignature(f);
     processParams(f);
-    return processReturn(f, config2.implicitReturns);
-  });
-  gatherRecursiveAll(statements, ({ type }) => type === "MethodDefinition").forEach((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);
-    return processReturn(f, config2.implicitReturns);
-  });
+    processReturn(f, config2.implicitReturns);
+  }
 }
 function expressionizeIteration(exp) {
   let { async, generator, block, children, statement } = exp;
@@ -3021,47 +3247,65 @@ function expressionizeIteration(exp) {
     updateParentPointers(exp);
     return;
   }
+  let statements;
   if (generator) {
+    if (statement.reduction) {
+      children.unshift({
+        type: "Error",
+        message: `Cannot use reduction (${statement.reduction.subtype}) with generators`
+      });
+    }
+    iterationDefaultBody(statement);
     assignResults(block, (node) => {
       return {
         type: "YieldExpression",
         expression: node,
-        children: ["yield ", node]
+        children: [
+          {
+            type: "Yield",
+            token: "yield "
+          },
+          node
+        ]
       };
     });
-    children.splice(
-      i,
-      1,
-      wrapIIFE([
-        ["", statement, void 0],
-        // Prevent implicit return in generator, by adding an explicit return
-        ["", {
-          type: "ReturnStatement",
-          expression: void 0,
-          children: [";return"]
-        }, void 0]
-      ], async, generator)
-    );
+    statements = [
+      ["", statement]
+    ];
   } else {
     const resultsRef = statement.resultsRef ??= makeRef("results");
-    const { declaration, breakWithOnly } = iterationDeclaration(statement);
-    if (!breakWithOnly) {
-      assignResults(block, (node) => {
-        return [resultsRef, ".push(", node, ")"];
-      });
-      braceBlock(block);
+    const declaration = iterationDeclaration(statement);
+    statements = [
+      ["", declaration, ";"],
+      ["", statement, statement.block.bare ? ";" : void 0],
+      ["", resultsRef]
+    ];
+  }
+  let done;
+  if (!async) {
+    let ref13;
+    if ((ref13 = blockContainingStatement(exp)) && typeof ref13 === "object" && "block" in ref13 && "index" in ref13) {
+      const { block: parentBlock, index } = ref13;
+      statements[0][0] = parentBlock.expressions[index][0];
+      parentBlock.expressions.splice(index, index + 1 - index, ...statements);
+      updateParentPointers(parentBlock);
+      braceBlock(parentBlock);
+      done = true;
     }
-    children.splice(
-      i,
-      1,
-      wrapIIFE([
-        ["", declaration, ";"],
-        ["", statement, void 0],
-        ["", wrapWithReturn(resultsRef)]
-      ], async)
-    );
   }
-  updateParentPointers(exp);
+  if (!done) {
+    if (!generator) {
+      statements[statements.length - 1][1] = wrapWithReturn(statements[statements.length - 1][1]);
+    }
+    children.splice(i, 1, wrapIIFE(statements, async, generator));
+    updateParentPointers(exp);
+  }
+}
+function processIterationExpressions(statements) {
+  for (let ref14 = gatherRecursiveAll(statements, ($15) => $15.type === "IterationExpression"), i6 = 0, len5 = ref14.length; i6 < len5; i6++) {
+    const s = ref14[i6];
+    expressionizeIteration(s);
+  }
 }
 function skipImplicitArguments(args) {
   if (args.length === 1) {
@@ -3085,12 +3329,12 @@ function processCoffeeDo(ws, expression) {
       ...parameters,
       children: (() => {
         const results1 = [];
-        for (let ref10 = parameters.children, i3 = 0, len22 = ref10.length; i3 < len22; i3++) {
-          let parameter = ref10[i3];
+        for (let ref15 = parameters.children, i7 = 0, len6 = ref15.length; i7 < len6; i7++) {
+          let parameter = ref15[i7];
           if (typeof parameter === "object" && parameter != null && "type" in parameter && parameter.type === "Parameter") {
-            let ref11;
-            if (ref11 = parameter.initializer) {
-              const initializer = ref11;
+            let ref16;
+            if (ref16 = parameter.initializer) {
+              const initializer = ref16;
               args.push(initializer.expression, parameter.delim);
               parameter = {
                 ...parameter,
@@ -3111,7 +3355,7 @@ function processCoffeeDo(ws, expression) {
     expression = {
       ...expression,
       parameters: newParameters,
-      children: expression.children.map(($13) => $13 === parameters ? newParameters : $13)
+      children: expression.children.map(($16) => $16 === parameters ? newParameters : $16)
     };
   }
   return {
@@ -3133,7 +3377,7 @@ function makeAmpersandFunction(rhs) {
     ref = makeRef("$");
     inplacePrepend(ref, body);
   }
-  if (startsWithPredicate(body, ($14) => $14.type === "ObjectExpression")) {
+  if (startsWithPredicate(body, ($17) => $17.type === "ObjectExpression")) {
     body = makeLeftHandSideExpression(body);
   }
   const parameters = makeNode({
@@ -3373,6 +3617,28 @@ function needsPrecedingSemicolon(exp) {
     }
   }
 }
+function blockContainingStatement(exp) {
+  let child = exp;
+  let parent = exp.parent;
+  let m;
+  while (parent != null && (m = parent.type, m === "StatementExpression" || m === "PipelineExpression" || m === "UnwrappedExpression")) {
+    child = parent;
+    parent = parent.parent;
+  }
+  if (!(parent?.type === "BlockStatement")) {
+    return;
+  }
+  const index = findChildIndex(parent.expressions, child);
+  assert.notEqual(index, -1, "Could not find statement in parent block");
+  if (!(parent.expressions[index][1] === child)) {
+    return;
+  }
+  return {
+    block: parent,
+    index,
+    child
+  };
+}
 
 // source/parser/op.civet
 var precedenceOrder = [
@@ -4634,8 +4900,9 @@ function convertWithClause(withClause, extendsClause) {
 
 // source/parser/unary.civet
 function processUnaryExpression(pre, exp, post) {
-  if (!(pre.length || post))
+  if (!(pre.length || post)) {
     return exp;
+  }
   if (post?.token === "?") {
     post = {
       $loc: post.$loc,
@@ -4666,29 +4933,25 @@ function processUnaryExpression(pre, exp, post) {
     }
     return exp;
   }
-  if (exp.type === "Literal") {
-    if (pre.length === 1) {
-      const { token } = pre[0];
-      if (token === "-" || token === "+") {
-        const children = [pre[0], ...exp.children];
-        const literal = {
-          type: "Literal",
-          children,
-          raw: `${token}${exp.raw}`
-        };
-        if (post) {
-          return {
-            type: "UnaryExpression",
-            children: [literal, post]
-          };
-        }
-        return literal;
+  if (exp?.type === "Literal" && pre.length) {
+    let [...ref] = pre, [last] = ref.splice(-1);
+    let m;
+    if (m = last?.token, m === "+" || m === "-") {
+      last = last;
+      exp = {
+        ...exp,
+        children: [last, ...exp.children],
+        raw: `${last.token}${exp.raw}`
+      };
+      pre = pre.slice(0, -1);
+      if (!(pre.length || post)) {
+        return exp;
       }
     }
   }
-  let ref;
-  while (ref = pre.length) {
-    const l = ref;
+  let ref1;
+  while (ref1 = pre.length) {
+    const l = ref1;
     const last = pre[l - 1];
     if (last.type === "Await") {
       if (last.op) {
@@ -4701,8 +4964,8 @@ function processUnaryExpression(pre, exp, post) {
         };
         pre = pre.slice(0, -1);
       } else {
-        let m;
-        if (m = firstNonSpace(exp), typeof m === "string" && /^[ \t]*\n/.test(m) || typeof m === "object" && m != null && "token" in m && typeof m.token === "string" && /^[ \t]*\n/.test(m.token)) {
+        let m1;
+        if (m1 = firstNonSpace(exp), typeof m1 === "string" && /^[ \t]*\n/.test(m1) || typeof m1 === "object" && m1 != null && "token" in m1 && typeof m1.token === "string" && /^[ \t]*\n/.test(m1.token)) {
           exp = parenthesizeExpression(exp);
         }
         exp = {
@@ -4806,6 +5069,7 @@ function constructInvocation(fn, arg) {
     updateParentPointers(ref);
     return makeNode({
       type: "UnwrappedExpression",
+      expression: body,
       children: [skipIfOnlyWS(fn.leadingComment), body, skipIfOnlyWS(fn.trailingComment)]
     });
   }
@@ -4842,6 +5106,17 @@ function constructPipeStep(fn, arg, returning) {
         returning
       ];
     }
+    case "throw": {
+      const statement = { type: "ThrowStatement", children };
+      return [
+        {
+          type: "StatementExpression",
+          statement,
+          children: [statement]
+        },
+        null
+      ];
+    }
     case "return": {
       return [{
         type: "ReturnStatement",
@@ -5126,25 +5401,40 @@ function forRange(open, forDeclaration, range, stepExp, close) {
   const infinite = typeof end === "object" && end != null && "type" in end && end.type === "Identifier" && "name" in end && end.name === "Infinity";
   let stepRef, asc;
   if (stepExp) {
-    stepExp = insertTrimmingSpace(stepExp, "");
+    stepExp = trimFirstSpace(stepExp);
     stepRef = maybeRef(stepExp, "step");
   } else if (infinite) {
-    stepExp = stepRef = "1";
+    stepExp = stepRef = makeNumericLiteral(1);
   } else if (increasing != null) {
     if (increasing) {
-      stepExp = stepRef = "1";
+      stepExp = stepRef = makeNumericLiteral(1);
       asc = true;
     } else {
-      stepExp = stepRef = "-1";
+      stepExp = stepRef = makeNumericLiteral(-1);
       asc = false;
     }
   }
   let ref2;
+  if (stepExp?.type === "Literal") {
+    try {
+      ref2 = literalValue(stepExp);
+    } catch (e) {
+      ref2 = void 0;
+    }
+  } else {
+    ref2 = void 0;
+  }
+  ;
+  const stepValue = ref2;
+  if (typeof stepValue === "number") {
+    asc = stepValue > 0;
+  }
+  let ref3;
   if (stepRef)
-    ref2 = start;
+    ref3 = start;
   else
-    ref2 = maybeRef(start, "start");
-  let startRef = ref2;
+    ref3 = maybeRef(start, "start");
+  let startRef = ref3;
   let endRef = maybeRef(end, "end");
   const startRefDec = startRef !== start ? [startRef, " = ", start, ", "] : [];
   const endRefDec = endRef !== end ? [endRef, " = ", end, ", "] : [];
@@ -5156,11 +5446,11 @@ function forRange(open, forDeclaration, range, stepExp, close) {
     ];
   }
   let ascDec = [], ascRef;
-  if (stepRef) {
+  if (stepExp) {
     if (!(stepRef === stepExp)) {
       ascDec = [", ", stepRef, " = ", stepExp];
     }
-  } else if ("Literal" === start.type && start.type === end.type) {
+  } else if (start?.type === "Literal" && "Literal" === end?.type) {
     asc = literalValue(start) <= literalValue(end);
     if ("StringLiteral" === start.subtype && start.subtype === end.subtype) {
       startRef = literalValue(start).charCodeAt(0).toString();
@@ -5171,10 +5461,11 @@ function forRange(open, forDeclaration, range, stepExp, close) {
     ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
   }
   let varAssign = [], varLetAssign = varAssign, varLet = varAssign, blockPrefix;
-  if (forDeclaration?.declare) {
-    if (forDeclaration.declare.token === "let") {
+  let names = forDeclaration?.names;
+  if (forDeclaration?.decl) {
+    if (forDeclaration.decl === "let") {
       const varName = forDeclaration.children.splice(1);
-      varAssign = [...insertTrimmingSpace(varName, ""), " = "];
+      varAssign = [...trimFirstSpace(varName), " = "];
       varLet = [",", ...varName, " = ", counterRef];
     } else {
       const value = "StringLiteral" === start.subtype ? ["String.fromCharCode(", counterRef, ")"] : counterRef;
@@ -5183,26 +5474,41 @@ function forRange(open, forDeclaration, range, stepExp, close) {
       ];
     }
   } else if (forDeclaration) {
+    assert.equal(
+      forDeclaration.type,
+      "AssignmentExpression",
+      "Internal error: Coffee-style for loop must be an assignment expression"
+    );
     varAssign = varLetAssign = [forDeclaration, " = "];
+    names = [];
   }
   const declaration = {
     type: "Declaration",
     children: ["let ", ...startRefDec, ...endRefDec, counterRef, " = ", ...varLetAssign, startRef, ...varLet, ...ascDec],
-    names: forDeclaration?.names
+    names
   };
   const counterPart = right.inclusive ? [counterRef, " <= ", endRef, " : ", counterRef, " >= ", endRef] : [counterRef, " < ", endRef, " : ", counterRef, " > ", endRef];
-  const condition = infinite ? [] : asc != null ? asc ? counterPart.slice(0, 3) : counterPart.slice(4) : stepRef ? [stepRef, " !== 0 && (", stepRef, " > 0 ? ", ...counterPart, ")"] : [ascRef, " ? ", ...counterPart];
-  const increment = stepRef === "1" ? [...varAssign, "++", counterRef] : stepRef === "-1" ? [...varAssign, "--", counterRef] : stepRef ? [...varAssign, counterRef, " += ", stepRef] : ascRef ? [...varAssign, ascRef, " ? ++", counterRef, " : --", counterRef] : [...varAssign, asc ? "++" : "--", counterRef];
+  const condition = infinite || stepValue === 0 ? [] : asc != null ? asc ? counterPart.slice(0, 3) : counterPart.slice(4) : stepRef ? [stepRef, " !== 0 && (", stepRef, " > 0 ? ", ...counterPart, ")"] : [ascRef, " ? ", ...counterPart];
+  const increment = stepValue === 1 ? [...varAssign, "++", counterRef] : stepValue === -1 ? [...varAssign, "--", counterRef] : stepRef ? [...varAssign, counterRef, " += ", stepRef] : ascRef ? [...varAssign, ascRef, " ? ++", counterRef, " : --", counterRef] : [...varAssign, asc ? "++" : "--", counterRef];
   return {
-    declaration,
+    // This declaration doesn't always appear in the output,
+    // but it's still helpful for determining the primary loop variable
+    declaration: forDeclaration,
     children: [range.error, open, declaration, "; ", ...condition, "; ", ...increment, close],
     blockPrefix
   };
 }
-function processForInOf($0, getRef) {
+function processForInOf($0) {
   let [awaits, eachOwn, open, declaration, declaration2, ws, inOf, exp, step, close] = $0;
   if (exp.type === "RangeExpression" && inOf.token === "of" && !declaration2) {
-    return forRange(open, declaration, exp, step, close);
+    return forRange(
+      open,
+      declaration,
+      exp,
+      step && prepend(trimFirstSpace(step[0]), trimFirstSpace(step[2])),
+      // omit "by" token
+      close
+    );
   } else if (step) {
     throw new Error("for..of/in cannot use 'by' except with range literals");
   }
@@ -5218,22 +5524,22 @@ function processForInOf($0, getRef) {
       if (declaration2) {
         const [, , ws22, decl22] = declaration2;
         blockPrefix.push(["", [
-          insertTrimmingSpace(ws22, ""),
+          trimFirstSpace(ws22),
           decl22,
           " = ",
           counterRef
         ], ";"]);
         assignmentNames.push(...decl22.names);
       }
-      const expRefDec = expRef2 !== exp ? [insertTrimmingSpace(expRef2, " "), " = ", insertTrimmingSpace(exp, ""), ", "] : [];
+      const expRefDec = expRef2 !== exp ? [trimFirstSpace(expRef2), " = ", trimFirstSpace(exp), ", "] : [];
       blockPrefix.push(["", {
         type: "Declaration",
-        children: [declaration, " = ", insertTrimmingSpace(expRef2, ""), "[", counterRef, "]"],
+        children: [declaration, " = ", trimFirstSpace(expRef2), "[", counterRef, "]"],
         names: assignmentNames
       }, ";"]);
       declaration = {
         type: "Declaration",
-        children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", insertTrimmingSpace(expRef2, ""), ".length"],
+        children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", trimFirstSpace(expRef2), ".length"],
         names: []
       };
       const condition = [counterRef, " < ", lenRef, "; "];
@@ -5281,7 +5587,7 @@ function processForInOf($0, getRef) {
     return {
       declaration,
       blockPrefix,
-      children: [awaits, eachOwnError, open, declaration, ws, inOf, expRef ?? exp, step, close]
+      children: [awaits, eachOwnError, open, declaration, ws, inOf, expRef ?? exp, close]
       // omit declaration2, replace eachOwn with eachOwnError, replace exp with expRef
     };
   }
@@ -5298,7 +5604,7 @@ function processForInOf($0, getRef) {
       };
       blockPrefix.push(["", {
         type: "Declaration",
-        children: [insertTrimmingSpace(ws2, ""), decl2, " = ", counterRef, "++"],
+        children: [trimFirstSpace(ws2), decl2, " = ", counterRef, "++"],
         names: decl2.names
       }, ";"]);
       break;
@@ -5317,13 +5623,13 @@ function processForInOf($0, getRef) {
         };
       }
       if (own) {
-        const hasPropRef = getRef("hasProp");
-        blockPrefix.push(["", ["if (!", hasPropRef, "(", insertTrimmingSpace(expRef2, ""), ", ", insertTrimmingSpace(pattern, ""), ")) continue"], ";"]);
+        const hasPropRef = getHelperRef("hasProp");
+        blockPrefix.push(["", ["if (!", hasPropRef, "(", trimFirstSpace(expRef2), ", ", trimFirstSpace(pattern), ")) continue"], ";"]);
       }
       if (decl2) {
         blockPrefix.push(["", {
           type: "Declaration",
-          children: [insertTrimmingSpace(ws2, ""), decl2, " = ", insertTrimmingSpace(expRef2, ""), "[", insertTrimmingSpace(pattern, ""), "]"],
+          children: [trimFirstSpace(ws2), decl2, " = ", trimFirstSpace(expRef2), "[", trimFirstSpace(pattern), "]"],
           names: decl2.names
         }, ";"]);
       }
@@ -5336,7 +5642,7 @@ function processForInOf($0, getRef) {
   }
   return {
     declaration,
-    children: [awaits, eachOwnError, open, declaration, ws, inOf, exp, step, close],
+    children: [awaits, eachOwnError, open, declaration, ws, inOf, exp, close],
     // omit declaration2, replace each with eachOwnError
     blockPrefix,
     hoistDec
@@ -5469,7 +5775,7 @@ function createVarDecs(block, scopes, pushVar) {
     return createVarDecs(block2, scopes, pushVar);
   });
   forNodes.forEach(({ block: block2, declaration }) => {
-    scopes.push(new Set(declaration.names));
+    scopes.push(new Set(declaration?.names));
     createVarDecs(block2, scopes, pushVar);
     return scopes.pop();
   });
@@ -6433,8 +6739,8 @@ function processBindingPatternLHS(lhs, tail) {
   tail.push(...splices.map((s) => [", ", s]), ...thisAssignments.map((a) => [", ", a]));
 }
 function processAssignments(statements) {
-  gatherRecursiveAll(statements, (n) => n.type === "AssignmentExpression" || n.type === "UpdateExpression").forEach((exp) => {
-    function extractAssignment(lhs) {
+  for (let ref6 = gatherRecursiveAll(statements, ($3) => $3.type === "AssignmentExpression" || $3.type === "UpdateExpression"), i5 = 0, len4 = ref6.length; i5 < len4; i5++) {
+    let extractAssignment2 = function(lhs) {
       let expr = lhs;
       while (expr.type === "ParenthesizedExpression") {
         expr = expr.expression;
@@ -6452,17 +6758,20 @@ function processAssignments(statements) {
       }
       ;
       return;
-    }
+    };
+    var extractAssignment = extractAssignment2;
+    const exp = ref6[i5];
     const pre = [], post = [];
-    let ref6;
+    let ref7;
     switch (exp.type) {
       case "AssignmentExpression": {
-        if (!exp.lhs)
-          return;
+        if (!exp.lhs) {
+          continue;
+        }
         exp.lhs.forEach((lhsPart, i) => {
-          let ref7;
-          if (ref7 = extractAssignment(lhsPart[1])) {
-            const newLhs = ref7;
+          let ref8;
+          if (ref8 = extractAssignment2(lhsPart[1])) {
+            const newLhs = ref8;
             return lhsPart[1] = newLhs;
           }
           ;
@@ -6471,8 +6780,8 @@ function processAssignments(statements) {
         break;
       }
       case "UpdateExpression": {
-        if (ref6 = extractAssignment(exp.assigned)) {
-          const newLhs = ref6;
+        if (ref7 = extractAssignment2(exp.assigned)) {
+          const newLhs = ref7;
           const i = exp.children.indexOf(exp.assigned);
           exp.assigned = exp.children[i] = newLhs;
         }
@@ -6480,15 +6789,17 @@ function processAssignments(statements) {
         break;
       }
     }
-    if (pre.length)
+    if (pre.length) {
       exp.children.unshift(...pre);
-    if (post.length)
+    }
+    if (post.length) {
       exp.children.push(...post);
+    }
     if (exp.type === "UpdateExpression") {
       const { assigned } = exp;
       const ref = makeRef();
       const newMemberExp = unchainOptionalMemberExpression(assigned, ref, (children) => {
-        return exp.children.map(($3) => $3 === assigned ? children : $3);
+        return exp.children.map(($4) => $4 === assigned ? children : $4);
       });
       if (newMemberExp !== assigned) {
         if (newMemberExp.usesRef) {
@@ -6498,169 +6809,163 @@ function processAssignments(statements) {
             names: []
           };
         }
-        return replaceNode(exp, newMemberExp);
+        replaceNode(exp, newMemberExp);
       }
-      ;
-      return;
     }
-    ;
-    return;
-  });
-  replaceNodesRecursive(
-    statements,
-    (n) => n.type === "AssignmentExpression" && n.names === null,
-    (exp) => {
-      let { lhs: $1, expression: $2 } = exp, tail = [], len3 = $1.length;
-      let block;
-      let ref8;
-      if (exp.parent?.type === "BlockStatement" && !(ref8 = $1[$1.length - 1])?.[ref8.length - 1]?.special) {
-        block = makeBlockFragment();
-        let ref9;
-        if (ref9 = prependStatementExpressionBlock(
-          { type: "Initializer", expression: $2, children: [void 0, void 0, $2] },
-          block
-        )) {
-          const ref = ref9;
-          exp.children = exp.children.map(($4) => $4 === $2 ? ref : $4);
-          $2 = ref;
-        } else {
-          block = void 0;
-        }
+  }
+  for (let ref9 = gatherRecursiveAll(statements, ($5) => $5.type === "AssignmentExpression"), i6 = 0, len5 = ref9.length; i6 < len5; i6++) {
+    const exp = ref9[i6];
+    if (!(exp.names === null)) {
+      continue;
+    }
+    let { lhs: $1, expression: $2 } = exp, tail = [], len3 = $1.length;
+    let block;
+    let ref10;
+    if (exp.parent?.type === "BlockStatement" && !(ref10 = $1[$1.length - 1])?.[ref10.length - 1]?.special) {
+      block = makeBlockFragment();
+      let ref11;
+      if (ref11 = prependStatementExpressionBlock(
+        { type: "Initializer", expression: $2, children: [void 0, void 0, $2] },
+        block
+      )) {
+        const ref = ref11;
+        exp.children = exp.children.map(($6) => $6 === $2 ? ref : $6);
+        $2 = ref;
+      } else {
+        block = void 0;
       }
-      let ref10;
-      if ($1.some(($5) => (ref10 = $5)[ref10.length - 1].special)) {
-        if ($1.length !== 1)
-          throw new Error("Only one assignment with id= is allowed");
-        const [, lhs, , op] = $1[0];
-        const { call, omitLhs } = op;
-        const index = exp.children.indexOf($2);
-        if (index < 0)
-          throw new Error("Assertion error: exp not in AssignmentExpression");
-        exp.children.splice(
-          index,
-          1,
-          exp.expression = $2 = [call, "(", lhs, ", ", $2, ")"]
-        );
-        if (omitLhs) {
-          return $2;
-        }
+    }
+    let ref12;
+    if ($1.some(($7) => (ref12 = $7)[ref12.length - 1].special)) {
+      if ($1.length !== 1)
+        throw new Error("Only one assignment with id= is allowed");
+      const [, lhs, , op] = $1[0];
+      const { call, omitLhs } = op;
+      const index = exp.children.indexOf($2);
+      if (index < 0)
+        throw new Error("Assertion error: exp not in AssignmentExpression");
+      exp.children.splice(
+        index,
+        1,
+        exp.expression = $2 = [call, "(", lhs, ", ", $2, ")"]
+      );
+      if (omitLhs) {
+        replaceNode(exp, $2);
+        continue;
       }
-      let wrapped = false;
-      let i = 0;
-      while (i < len3) {
-        const lastAssignment = $1[i++];
-        const [, lhs, , op] = lastAssignment;
-        if (!(op.token === "=")) {
-          continue;
-        }
-        let m2;
-        if (m2 = lhs.type, m2 === "ObjectExpression" || m2 === "ObjectBindingPattern") {
-          if (!wrapped) {
-            wrapped = true;
-            lhs.children.splice(0, 0, "(");
-            tail.push(")");
-          }
+    }
+    let wrapped = false;
+    let i = 0;
+    while (i < len3) {
+      const lastAssignment = $1[i++];
+      const [, lhs, , op] = lastAssignment;
+      if (!(op.token === "=")) {
+        continue;
+      }
+      let m2;
+      if (m2 = lhs.type, m2 === "ObjectExpression" || m2 === "ObjectBindingPattern") {
+        if (!wrapped) {
+          wrapped = true;
+          lhs.children.splice(0, 0, "(");
+          tail.push(")");
         }
       }
-      const refsToDeclare = /* @__PURE__ */ new Set();
-      i = len3 - 1;
-      while (i >= 0) {
-        const lastAssignment = $1[i];
-        if (lastAssignment[3].token === "=") {
-          const lhs = lastAssignment[1];
-          let m3;
-          if (lhs.type === "MemberExpression") {
-            const members = lhs.children;
-            const lastMember = members[members.length - 1];
-            if (typeof lastMember === "object" && lastMember != null && "type" in lastMember && lastMember.type === "CallExpression" && "children" in lastMember && Array.isArray(lastMember.children) && lastMember.children.length >= 1 && lastMember.children[0] === peekHelperRef("rslice")) {
-              lastMember.children.push({
-                type: "Error",
-                message: "Slice range cannot be decreasing in assignment"
-              });
-              break;
+    }
+    const refsToDeclare = /* @__PURE__ */ new Set();
+    i = len3 - 1;
+    while (i >= 0) {
+      const lastAssignment = $1[i];
+      if (lastAssignment[3].token === "=") {
+        const lhs = lastAssignment[1];
+        let m3;
+        if (lhs.type === "MemberExpression") {
+          const members = lhs.children;
+          const lastMember = members[members.length - 1];
+          if (typeof lastMember === "object" && lastMember != null && "type" in lastMember && lastMember.type === "CallExpression" && "children" in lastMember && Array.isArray(lastMember.children) && lastMember.children.length >= 1 && lastMember.children[0] === peekHelperRef("rslice")) {
+            lastMember.children.push({
+              type: "Error",
+              message: "Slice range cannot be decreasing in assignment"
+            });
+            break;
+          }
+          if (lastMember.type === "SliceExpression") {
+            const { start, end, children: c } = lastMember;
+            c[0].token = ".splice(";
+            c[1] = start;
+            c[2] = ", ";
+            if (end) {
+              c[3] = [end, " - ", start];
+            } else {
+              c[3] = ["1/0"];
             }
-            if (lastMember.type === "SliceExpression") {
-              const { start, end, children: c } = lastMember;
-              c[0].token = ".splice(";
-              c[1] = start;
-              c[2] = ", ";
-              if (end) {
-                c[3] = [end, " - ", start];
-              } else {
-                c[3] = ["1/0"];
-              }
-              c[4] = [", ...", $2];
-              c[5] = ")";
+            c[4] = [", ...", $2];
+            c[5] = ")";
+            lastAssignment.pop();
+            if (isWhitespaceOrEmpty(lastAssignment[2]))
               lastAssignment.pop();
-              if (isWhitespaceOrEmpty(lastAssignment[2]))
-                lastAssignment.pop();
-              if ($1.length > 1) {
-                throw new Error("Not implemented yet! TODO: Handle multiple splice assignments");
-              }
-              exp.children = [$1];
-              exp.names = [];
-              break;
+            if ($1.length > 1) {
+              throw new Error("Not implemented yet! TODO: Handle multiple splice assignments");
             }
-          } else if (m3 = lhs.type, m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern") {
-            processBindingPatternLHS(lhs, tail);
-            gatherRecursiveAll(lhs, ($6) => $6.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
+            exp.children = [$1];
+            exp.names = [];
+            break;
           }
+        } else if (m3 = lhs.type, m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern") {
+          processBindingPatternLHS(lhs, tail);
+          gatherRecursiveAll(lhs, ($8) => $8.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
         }
-        i--;
       }
-      i = len3 - 1;
-      const optionalChainRef = makeRef();
-      while (i >= 0) {
-        const assignment = $1[i];
-        const [ws1, lhs, ws2, op] = assignment;
-        if (lhs.type === "MemberExpression" || lhs.type === "CallExpression") {
-          const newMemberExp = unchainOptionalMemberExpression(lhs, optionalChainRef, (children) => {
-            const assigns = $1.splice(i + 1, len3 - 1 - i);
-            $1.pop();
-            return [ws1, ...children, ws2, op, ...assigns, $2];
-          });
-          if (newMemberExp !== lhs) {
-            if (newMemberExp.usesRef) {
-              exp.hoistDec = {
-                type: "Declaration",
-                children: ["let ", optionalChainRef],
-                names: []
-              };
-            }
-            replaceNode($2, newMemberExp);
-            newMemberExp.parent = exp;
-            $2 = newMemberExp;
+      i--;
+    }
+    i = len3 - 1;
+    const optionalChainRef = makeRef();
+    while (i >= 0) {
+      const assignment = $1[i];
+      const [ws1, lhs, ws2, op] = assignment;
+      if (lhs.type === "MemberExpression" || lhs.type === "CallExpression") {
+        const newMemberExp = unchainOptionalMemberExpression(lhs, optionalChainRef, (children) => {
+          const assigns = $1.splice(i + 1, len3 - 1 - i);
+          $1.pop();
+          return [ws1, ...children, ws2, op, ...assigns, $2];
+        });
+        if (newMemberExp !== lhs) {
+          if (newMemberExp.usesRef) {
+            exp.hoistDec = {
+              type: "Declaration",
+              children: ["let ", optionalChainRef],
+              names: []
+            };
           }
+          replaceNode($2, newMemberExp);
+          $2 = newMemberExp;
         }
-        i--;
       }
-      if (refsToDeclare.size) {
-        if (exp.hoistDec) {
-          exp.hoistDec.children.push([...refsToDeclare].map(($7) => [",", $7]));
-        } else {
-          exp.hoistDec = {
-            type: "Declaration",
-            children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
-            names: []
-          };
-        }
-      }
-      exp.names = $1.flatMap(([, l]) => l.names || []);
-      if (tail.length) {
-        const index = exp.children.indexOf($2);
-        if (index < 0)
-          throw new Error("Assertion error: exp not in AssignmentExpression");
-        exp.children.splice(index + 1, 0, ...tail);
-      }
-      if (block) {
-        block.parent = exp.parent;
-        block.expressions.push(["", exp]);
-        exp.parent = block;
-        return block;
+      i--;
+    }
+    if (refsToDeclare.size) {
+      if (exp.hoistDec) {
+        exp.hoistDec.children.push([...refsToDeclare].map(($9) => [",", $9]));
+      } else {
+        exp.hoistDec = {
+          type: "Declaration",
+          children: ["let ", [...refsToDeclare].map((r, i2) => i2 ? [",", r] : r)],
+          names: []
+        };
       }
-      return exp;
     }
-  );
+    exp.names = $1.flatMap(([, l]) => l.names || []);
+    if (tail.length) {
+      const index = exp.children.indexOf($2);
+      if (index < 0)
+        throw new Error("Assertion error: exp not in AssignmentExpression");
+      exp.children.splice(index + 1, 0, ...tail);
+    }
+    if (block) {
+      replaceNode(exp, block);
+      block.expressions.push(["", exp]);
+      exp.parent = block;
+    }
+  }
 }
 function unchainOptionalMemberExpression(exp, ref, innerExp) {
   let j = 0;
@@ -6710,9 +7015,9 @@ function unchainOptionalMemberExpression(exp, ref, innerExp) {
     }
     j++;
   }
-  let ref11;
-  if (ref11 = conditions.length) {
-    const l = ref11;
+  let ref13;
+  if (ref13 = conditions.length) {
+    const l = ref13;
     const cs = flatJoin(conditions, " && ");
     return {
       ...exp,
@@ -6751,28 +7056,28 @@ function processTypes(node) {
     if (!unary.suffix.length) {
       return;
     }
-    let ref12;
+    let ref14;
     let m4;
-    if (m4 = (ref12 = unary.suffix)[ref12.length - 1], typeof m4 === "object" && m4 != null && "token" in m4 && m4.token === "?") {
+    if (m4 = (ref14 = unary.suffix)[ref14.length - 1], typeof m4 === "object" && m4 != null && "token" in m4 && m4.token === "?") {
       const { token } = m4;
       let last;
       let count = 0;
-      let ref13;
-      while (unary.suffix.length && (ref13 = unary.suffix)[ref13.length - 1]?.token === "?") {
+      let ref15;
+      while (unary.suffix.length && (ref15 = unary.suffix)[ref15.length - 1]?.token === "?") {
         last = unary.suffix.pop();
         count++;
       }
-      let ref14;
-      while (unary.suffix.length && (ref14 = unary.suffix)[ref14.length - 1]?.type === "NonNullAssertion") {
+      let ref16;
+      while (unary.suffix.length && (ref16 = unary.suffix)[ref16.length - 1]?.type === "NonNullAssertion") {
         unary.suffix.pop();
       }
-      let ref15;
+      let ref17;
       if (unary.suffix.length || unary.prefix.length)
-        ref15 = unary;
+        ref17 = unary;
       else
-        ref15 = unary.t;
-      const t = ref15;
-      if (unary.parent?.type === "TypeTuple") {
+        ref17 = unary.t;
+      const t = ref17;
+      if (unary.parent?.type === "TypeElement" && !unary.parent.name) {
         if (count === 1) {
           unary.suffix.push(last);
           return;
@@ -6799,12 +7104,12 @@ function processTypes(node) {
       }
     } else if (typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "NonNullAssertion") {
       const { type } = m4;
-      let ref16;
-      while (unary.suffix.length && (ref16 = unary.suffix)[ref16.length - 1]?.type === "NonNullAssertion") {
+      let ref18;
+      while (unary.suffix.length && (ref18 = unary.suffix)[ref18.length - 1]?.type === "NonNullAssertion") {
         unary.suffix.pop();
       }
-      let ref17;
-      while (unary.suffix.length && (ref17 = unary.suffix)[ref17.length - 1]?.token === "?") {
+      let ref19;
+      while (unary.suffix.length && (ref19 = unary.suffix)[ref19.length - 1]?.token === "?") {
         unary.suffix.pop();
       }
       const t = trimFirstSpace(
@@ -6830,35 +7135,41 @@ function processTypes(node) {
   });
 }
 function processStatementExpressions(statements) {
-  gatherRecursiveAll(statements, ($8) => $8.type === "StatementExpression").forEach((_exp) => {
-    const exp = _exp;
-    const { statement } = exp;
-    let ref18;
+  for (let ref20 = gatherRecursiveAll(statements, ($10) => $10.type === "StatementExpression"), i7 = 0, len6 = ref20.length; i7 < len6; i7++) {
+    const exp = ref20[i7];
+    const { maybe, statement } = exp;
+    if ((maybe || statement.type === "ThrowStatement") && blockContainingStatement(exp)) {
+      replaceNode(exp, statement);
+      continue;
+    }
+    let ref21;
     switch (statement.type) {
       case "IfStatement": {
-        if (ref18 = expressionizeIfStatement(statement)) {
-          const expression = ref18;
-          return replaceNode(statement, expression, exp);
+        if (ref21 = expressionizeIfStatement(statement)) {
+          const expression = ref21;
+          replaceNode(statement, expression, exp);
         } else {
-          return replaceNode(statement, wrapIIFE([["", statement]]), exp);
+          replaceNode(statement, wrapIIFE([["", statement]]), exp);
         }
+        ;
+        break;
       }
       case "IterationExpression": {
         if (statement.subtype === "ComptimeStatement") {
-          return replaceNode(
+          replaceNode(
             statement,
             expressionizeComptime(statement.statement),
             exp
           );
         }
         ;
-        return;
+        break;
       }
       default: {
-        return replaceNode(statement, wrapIIFE([["", statement]]), exp);
+        replaceNode(statement, wrapIIFE([["", statement]]), exp);
       }
     }
-  });
+  }
 }
 function processNegativeIndexAccess(statements) {
   gatherRecursiveAll(statements, (n) => n.type === "NegativeIndex").forEach((exp) => {
@@ -6906,7 +7217,7 @@ function processProgram(root) {
   if (config2.iife || config2.repl) {
     rootIIFE = wrapIIFE(root.expressions, root.topLevelAwait);
     const newExpressions = [["", rootIIFE]];
-    root.children = root.children.map(($9) => $9 === root.expressions ? newExpressions : $9);
+    root.children = root.children.map(($11) => $11 === root.expressions ? newExpressions : $11);
     root.expressions = newExpressions;
   }
   addParentPointers(root);
@@ -6920,7 +7231,7 @@ function processProgram(root) {
   processAssignments(statements);
   processStatementExpressions(statements);
   processPatternMatching(statements);
-  gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
+  processIterationExpressions(statements);
   hoistRefDecs(statements);
   processFunctions(statements, config2);
   statements.unshift(...state2.prelude);
@@ -6946,17 +7257,17 @@ async function processProgramAsync(root) {
   await processComptime(statements);
 }
 function processRepl(root, rootIIFE) {
-  const topBlock = gatherRecursive(rootIIFE, ($10) => $10.type === "BlockStatement")[0];
+  const topBlock = gatherRecursive(rootIIFE, ($12) => $12.type === "BlockStatement")[0];
   let i = 0;
-  for (let ref19 = gatherRecursiveWithinFunction(topBlock, ($11) => $11.type === "Declaration"), i5 = 0, len4 = ref19.length; i5 < len4; i5++) {
-    const decl = ref19[i5];
+  for (let ref22 = gatherRecursiveWithinFunction(topBlock, ($13) => $13.type === "Declaration"), i8 = 0, len7 = ref22.length; i8 < len7; i8++) {
+    const decl = ref22[i8];
     if (decl.parent === topBlock || decl.decl === "var") {
       decl.children.shift();
       root.expressions.splice(i++, 0, ["", `var ${decl.names.join(",")};`]);
     }
   }
-  for (let ref20 = gatherRecursive(topBlock, ($12) => $12.type === "FunctionExpression"), i6 = 0, len5 = ref20.length; i6 < len5; i6++) {
-    const func = ref20[i6];
+  for (let ref23 = gatherRecursive(topBlock, ($14) => $14.type === "FunctionExpression"), i9 = 0, len8 = ref23.length; i9 < len8; i9++) {
+    const func = ref23[i9];
     if (func.name && func.parent?.type === "BlockStatement") {
       if (func.parent === topBlock) {
         replaceNode(func, void 0);
@@ -6968,8 +7279,8 @@ function processRepl(root, rootIIFE) {
       }
     }
   }
-  for (let ref21 = gatherRecursiveWithinFunction(topBlock, ($13) => $13.type === "ClassExpression"), i7 = 0, len6 = ref21.length; i7 < len6; i7++) {
-    const classExp = ref21[i7];
+  for (let ref24 = gatherRecursiveWithinFunction(topBlock, ($15) => $15.type === "ClassExpression"), i10 = 0, len9 = ref24.length; i10 < len9; i10++) {
+    const classExp = ref24[i10];
     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)) {
       classExp.children.unshift(classExp.name, "=");
@@ -6978,7 +7289,7 @@ function processRepl(root, rootIIFE) {
   }
 }
 function populateRefs(statements) {
-  const refNodes = gatherRecursive(statements, ($14) => $14.type === "Ref");
+  const refNodes = gatherRecursive(statements, ($16) => $16.type === "Ref");
   if (refNodes.length) {
     const ids = gatherRecursive(statements, (s) => s.type === "Identifier");
     const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
@@ -7001,13 +7312,14 @@ function populateRefs(statements) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  gatherRecursiveAll(statements, ($15) => $15.type === "Placeholder").forEach((_exp) => {
+  gatherRecursiveAll(statements, ($17) => $17.type === "Placeholder").forEach((_exp) => {
     const exp = _exp;
     let ancestor;
     if (exp.subtype === ".") {
-      ({ ancestor } = findAncestor(exp, ($16) => $16.type === "Call"));
+      ({ ancestor } = findAncestor(exp, ($18) => $18.type === "Call"));
       ancestor = ancestor?.parent;
-      while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
+      let m6;
+      while (ancestor?.parent != null && (m6 = ancestor.parent.type, m6 === "UnaryExpression" || m6 === "NewExpression" || m6 === "AwaitExpression" || m6 === "ThrowStatement" || m6 === "StatementExpression")) {
         ancestor = ancestor.parent;
       }
       if (!ancestor) {
@@ -7024,10 +7336,10 @@ function processPlaceholders(statements) {
         if (type === "IfStatement") {
           liftedIfs.add(ancestor2);
         }
-        let m6;
         let m7;
+        let m8;
         return type === "Call" || // Block, except for if/else blocks when condition already lifted
-        type === "BlockStatement" && !((m6 = ancestor2.parent, typeof m6 === "object" && m6 != null && "type" in m6 && m6.type === "IfStatement") && liftedIfs.has(ancestor2.parent)) && !((m7 = ancestor2.parent, typeof m7 === "object" && m7 != null && "type" in m7 && m7.type === "ElseClause" && "parent" in m7 && typeof m7.parent === "object" && m7.parent != null && "type" in m7.parent && m7.parent.type === "IfStatement") && liftedIfs.has(ancestor2.parent.parent)) || type === "PipelineExpression" || // Declaration
+        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 === "Initializer" || // Right-hand side of assignment
         type === "AssignmentExpression" && findChildIndex(ancestor2, child2) === ancestor2.children.indexOf(ancestor2.expression) || type === "ReturnStatement" || type === "YieldExpression";
       }));
@@ -7103,11 +7415,11 @@ function processPlaceholders(statements) {
   for (const [ancestor, placeholders] of placeholderMap) {
     let ref = makeRef("$");
     let typeSuffix;
-    for (let i8 = 0, len7 = placeholders.length; i8 < len7; i8++) {
-      const placeholder = placeholders[i8];
+    for (let i11 = 0, len10 = placeholders.length; i11 < len10; i11++) {
+      const placeholder = placeholders[i11];
       typeSuffix ??= placeholder.typeSuffix;
-      let ref22;
-      replaceNode((ref22 = placeholder.children)[ref22.length - 1], ref);
+      let ref25;
+      replaceNode((ref25 = placeholder.children)[ref25.length - 1], ref);
     }
     const { parent } = ancestor;
     const body = maybeUnwrap(ancestor);
@@ -7128,16 +7440,16 @@ function processPlaceholders(statements) {
       }
       case "PipelineExpression": {
         const i = findChildIndex(parent, ancestor);
-        let ref23;
+        let ref26;
         if (i === 1) {
-          ref23 = ancestor === parent.children[i];
+          ref26 = ancestor === parent.children[i];
         } else if (i === 2) {
-          ref23 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
+          ref26 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
         } else {
-          ref23 = void 0;
+          ref26 = void 0;
         }
         ;
-        outer = ref23;
+        outer = ref26;
         break;
       }
       case "AssignmentExpression":
@@ -7152,9 +7464,9 @@ function processPlaceholders(statements) {
       fnExp = makeLeftHandSideExpression(fnExp);
     }
     replaceNode(ancestor, fnExp, parent);
-    let ref24;
-    if (ref24 = getTrimmingSpace(body)) {
-      const ws = ref24;
+    let ref27;
+    if (ref27 = getTrimmingSpace(body)) {
+      const ws = ref27;
       inplaceInsertTrimmingSpace(body, "");
       inplacePrepend(ws, fnExp);
     }
@@ -7199,8 +7511,8 @@ function reorderBindingRestProperty(props) {
       }
     ];
   }
-  let ref25;
-  if (Array.isArray(rest.delim) && (ref25 = rest.delim)[ref25.length - 1]?.token === ",") {
+  let ref28;
+  if (Array.isArray(rest.delim) && (ref28 = rest.delim)[ref28.length - 1]?.token === ",") {
     rest.delim = rest.delim.slice(0, -1);
     rest.children = [...rest.children.slice(0, -1), rest.delim];
   }
@@ -7225,9 +7537,9 @@ function replaceNodes(root, predicate, replacer) {
       return root;
     }
   }
-  for (let i9 = 0, len8 = array.length; i9 < len8; i9++) {
-    const i = i9;
-    const node = array[i9];
+  for (let i12 = 0, len11 = array.length; i12 < len11; i12++) {
+    const i = i12;
+    const node = array[i12];
     if (!(node != null)) {
       return;
     }
@@ -7239,34 +7551,6 @@ function replaceNodes(root, predicate, replacer) {
   }
   return root;
 }
-function replaceNodesRecursive(root, predicate, replacer) {
-  if (!(root != null)) {
-    return root;
-  }
-  const array = Array.isArray(root) ? root : root.children;
-  if (!array) {
-    if (predicate(root)) {
-      return replacer(root, root);
-    } else {
-      return root;
-    }
-  }
-  for (let i10 = 0, len9 = array.length; i10 < len9; i10++) {
-    const i = i10;
-    const node = array[i10];
-    if (!(node != null)) {
-      continue;
-    }
-    if (predicate(node)) {
-      const ret = replacer(node, root);
-      replaceNodesRecursive(ret, predicate, replacer);
-      array[i] = ret;
-    } else {
-      replaceNodesRecursive(node, predicate, replacer);
-    }
-  }
-  return root;
-}
 function typeOfJSX(node, config2) {
   switch (node.type) {
     case "JSXElement":
@@ -7650,6 +7934,7 @@ var grammar = {
   ForStatement,
   ForClause,
   ForStatementControlWithWhen,
+  ForReduction,
   ForStatementControl,
   WhenCondition,
   CoffeeForStatementParameters,
@@ -8063,7 +8348,7 @@ var grammar = {
   InlineInterfacePropertyDelimiter,
   TypeBinaryOp,
   TypeFunction,
-  TypeArrowFunction,
+  TypeFunctionArrow,
   TypeArguments,
   ImplicitTypeArguments,
   TypeApplicationStart,
@@ -8270,128 +8555,135 @@ var $L116 = (0, import_lib4.$L)("\u2209");
 var $L117 = (0, import_lib4.$L)("&");
 var $L118 = (0, import_lib4.$L)("|");
 var $L119 = (0, import_lib4.$L)(";");
-var $L120 = (0, import_lib4.$L)("break");
-var $L121 = (0, import_lib4.$L)("continue");
-var $L122 = (0, import_lib4.$L)("debugger");
-var $L123 = (0, import_lib4.$L)("require");
-var $L124 = (0, import_lib4.$L)("with");
-var $L125 = (0, import_lib4.$L)("assert");
-var $L126 = (0, import_lib4.$L)(":=");
-var $L127 = (0, import_lib4.$L)("\u2254");
-var $L128 = (0, import_lib4.$L)(".=");
-var $L129 = (0, import_lib4.$L)("::=");
-var $L130 = (0, import_lib4.$L)("/*");
-var $L131 = (0, import_lib4.$L)("*/");
-var $L132 = (0, import_lib4.$L)("\\");
-var $L133 = (0, import_lib4.$L)(")");
-var $L134 = (0, import_lib4.$L)("abstract");
-var $L135 = (0, import_lib4.$L)("as");
-var $L136 = (0, import_lib4.$L)("@");
-var $L137 = (0, import_lib4.$L)("@@");
-var $L138 = (0, import_lib4.$L)("async");
-var $L139 = (0, import_lib4.$L)("await");
-var $L140 = (0, import_lib4.$L)("`");
-var $L141 = (0, import_lib4.$L)("by");
-var $L142 = (0, import_lib4.$L)("case");
-var $L143 = (0, import_lib4.$L)("catch");
-var $L144 = (0, import_lib4.$L)("class");
-var $L145 = (0, import_lib4.$L)("#{");
-var $L146 = (0, import_lib4.$L)("comptime");
-var $L147 = (0, import_lib4.$L)("declare");
-var $L148 = (0, import_lib4.$L)("default");
-var $L149 = (0, import_lib4.$L)("delete");
-var $L150 = (0, import_lib4.$L)("do");
-var $L151 = (0, import_lib4.$L)("..");
-var $L152 = (0, import_lib4.$L)("\u2025");
-var $L153 = (0, import_lib4.$L)("...");
-var $L154 = (0, import_lib4.$L)("\u2026");
-var $L155 = (0, import_lib4.$L)("::");
-var $L156 = (0, import_lib4.$L)('"');
-var $L157 = (0, import_lib4.$L)("each");
-var $L158 = (0, import_lib4.$L)("else");
-var $L159 = (0, import_lib4.$L)("!");
-var $L160 = (0, import_lib4.$L)("export");
-var $L161 = (0, import_lib4.$L)("extends");
-var $L162 = (0, import_lib4.$L)("finally");
-var $L163 = (0, import_lib4.$L)("for");
-var $L164 = (0, import_lib4.$L)("from");
-var $L165 = (0, import_lib4.$L)("function");
-var $L166 = (0, import_lib4.$L)("get");
-var $L167 = (0, import_lib4.$L)("set");
-var $L168 = (0, import_lib4.$L)("#");
-var $L169 = (0, import_lib4.$L)("if");
-var $L170 = (0, import_lib4.$L)("in");
-var $L171 = (0, import_lib4.$L)("infer");
-var $L172 = (0, import_lib4.$L)("let");
-var $L173 = (0, import_lib4.$L)("const");
-var $L174 = (0, import_lib4.$L)("is");
-var $L175 = (0, import_lib4.$L)("var");
-var $L176 = (0, import_lib4.$L)("like");
-var $L177 = (0, import_lib4.$L)("loop");
-var $L178 = (0, import_lib4.$L)("new");
-var $L179 = (0, import_lib4.$L)("not");
-var $L180 = (0, import_lib4.$L)("of");
-var $L181 = (0, import_lib4.$L)("[");
-var $L182 = (0, import_lib4.$L)("operator");
-var $L183 = (0, import_lib4.$L)("override");
-var $L184 = (0, import_lib4.$L)("own");
-var $L185 = (0, import_lib4.$L)("public");
-var $L186 = (0, import_lib4.$L)("private");
-var $L187 = (0, import_lib4.$L)("protected");
-var $L188 = (0, import_lib4.$L)("||>");
-var $L189 = (0, import_lib4.$L)("|\u25B7");
-var $L190 = (0, import_lib4.$L)("|>=");
-var $L191 = (0, import_lib4.$L)("\u25B7=");
-var $L192 = (0, import_lib4.$L)("|>");
-var $L193 = (0, import_lib4.$L)("\u25B7");
-var $L194 = (0, import_lib4.$L)("readonly");
-var $L195 = (0, import_lib4.$L)("return");
-var $L196 = (0, import_lib4.$L)("satisfies");
-var $L197 = (0, import_lib4.$L)("'");
-var $L198 = (0, import_lib4.$L)("static");
-var $L199 = (0, import_lib4.$L)("${");
-var $L200 = (0, import_lib4.$L)("super");
-var $L201 = (0, import_lib4.$L)("switch");
-var $L202 = (0, import_lib4.$L)("target");
-var $L203 = (0, import_lib4.$L)("then");
-var $L204 = (0, import_lib4.$L)("this");
-var $L205 = (0, import_lib4.$L)("throw");
-var $L206 = (0, import_lib4.$L)('"""');
-var $L207 = (0, import_lib4.$L)("'''");
-var $L208 = (0, import_lib4.$L)("///");
-var $L209 = (0, import_lib4.$L)("```");
-var $L210 = (0, import_lib4.$L)("try");
-var $L211 = (0, import_lib4.$L)("typeof");
-var $L212 = (0, import_lib4.$L)("undefined");
-var $L213 = (0, import_lib4.$L)("unless");
-var $L214 = (0, import_lib4.$L)("until");
-var $L215 = (0, import_lib4.$L)("using");
-var $L216 = (0, import_lib4.$L)("void");
-var $L217 = (0, import_lib4.$L)("when");
-var $L218 = (0, import_lib4.$L)("while");
-var $L219 = (0, import_lib4.$L)("yield");
-var $L220 = (0, import_lib4.$L)("/>");
-var $L221 = (0, import_lib4.$L)("</");
-var $L222 = (0, import_lib4.$L)("<>");
-var $L223 = (0, import_lib4.$L)("</>");
-var $L224 = (0, import_lib4.$L)("<!--");
-var $L225 = (0, import_lib4.$L)("-->");
-var $L226 = (0, import_lib4.$L)("type");
-var $L227 = (0, import_lib4.$L)("enum");
-var $L228 = (0, import_lib4.$L)("interface");
-var $L229 = (0, import_lib4.$L)("global");
-var $L230 = (0, import_lib4.$L)("module");
-var $L231 = (0, import_lib4.$L)("namespace");
-var $L232 = (0, import_lib4.$L)("asserts");
-var $L233 = (0, import_lib4.$L)("keyof");
-var $L234 = (0, import_lib4.$L)("???");
-var $L235 = (0, import_lib4.$L)("unique");
-var $L236 = (0, import_lib4.$L)("symbol");
-var $L237 = (0, import_lib4.$L)("[]");
-var $L238 = (0, import_lib4.$L)("civet");
+var $L120 = (0, import_lib4.$L)("some");
+var $L121 = (0, import_lib4.$L)("every");
+var $L122 = (0, import_lib4.$L)("count");
+var $L123 = (0, import_lib4.$L)("sum");
+var $L124 = (0, import_lib4.$L)("product");
+var $L125 = (0, import_lib4.$L)("min");
+var $L126 = (0, import_lib4.$L)("max");
+var $L127 = (0, import_lib4.$L)("break");
+var $L128 = (0, import_lib4.$L)("continue");
+var $L129 = (0, import_lib4.$L)("debugger");
+var $L130 = (0, import_lib4.$L)("require");
+var $L131 = (0, import_lib4.$L)("with");
+var $L132 = (0, import_lib4.$L)("assert");
+var $L133 = (0, import_lib4.$L)(":=");
+var $L134 = (0, import_lib4.$L)("\u2254");
+var $L135 = (0, import_lib4.$L)(".=");
+var $L136 = (0, import_lib4.$L)("::=");
+var $L137 = (0, import_lib4.$L)("/*");
+var $L138 = (0, import_lib4.$L)("*/");
+var $L139 = (0, import_lib4.$L)("\\");
+var $L140 = (0, import_lib4.$L)(")");
+var $L141 = (0, import_lib4.$L)("abstract");
+var $L142 = (0, import_lib4.$L)("as");
+var $L143 = (0, import_lib4.$L)("@");
+var $L144 = (0, import_lib4.$L)("@@");
+var $L145 = (0, import_lib4.$L)("async");
+var $L146 = (0, import_lib4.$L)("await");
+var $L147 = (0, import_lib4.$L)("`");
+var $L148 = (0, import_lib4.$L)("by");
+var $L149 = (0, import_lib4.$L)("case");
+var $L150 = (0, import_lib4.$L)("catch");
+var $L151 = (0, import_lib4.$L)("class");
+var $L152 = (0, import_lib4.$L)("#{");
+var $L153 = (0, import_lib4.$L)("comptime");
+var $L154 = (0, import_lib4.$L)("declare");
+var $L155 = (0, import_lib4.$L)("default");
+var $L156 = (0, import_lib4.$L)("delete");
+var $L157 = (0, import_lib4.$L)("do");
+var $L158 = (0, import_lib4.$L)("..");
+var $L159 = (0, import_lib4.$L)("\u2025");
+var $L160 = (0, import_lib4.$L)("...");
+var $L161 = (0, import_lib4.$L)("\u2026");
+var $L162 = (0, import_lib4.$L)("::");
+var $L163 = (0, import_lib4.$L)('"');
+var $L164 = (0, import_lib4.$L)("each");
+var $L165 = (0, import_lib4.$L)("else");
+var $L166 = (0, import_lib4.$L)("!");
+var $L167 = (0, import_lib4.$L)("export");
+var $L168 = (0, import_lib4.$L)("extends");
+var $L169 = (0, import_lib4.$L)("finally");
+var $L170 = (0, import_lib4.$L)("for");
+var $L171 = (0, import_lib4.$L)("from");
+var $L172 = (0, import_lib4.$L)("function");
+var $L173 = (0, import_lib4.$L)("get");
+var $L174 = (0, import_lib4.$L)("set");
+var $L175 = (0, import_lib4.$L)("#");
+var $L176 = (0, import_lib4.$L)("if");
+var $L177 = (0, import_lib4.$L)("in");
+var $L178 = (0, import_lib4.$L)("infer");
+var $L179 = (0, import_lib4.$L)("let");
+var $L180 = (0, import_lib4.$L)("const");
+var $L181 = (0, import_lib4.$L)("is");
+var $L182 = (0, import_lib4.$L)("var");
+var $L183 = (0, import_lib4.$L)("like");
+var $L184 = (0, import_lib4.$L)("loop");
+var $L185 = (0, import_lib4.$L)("new");
+var $L186 = (0, import_lib4.$L)("not");
+var $L187 = (0, import_lib4.$L)("of");
+var $L188 = (0, import_lib4.$L)("[");
+var $L189 = (0, import_lib4.$L)("operator");
+var $L190 = (0, import_lib4.$L)("override");
+var $L191 = (0, import_lib4.$L)("own");
+var $L192 = (0, import_lib4.$L)("public");
+var $L193 = (0, import_lib4.$L)("private");
+var $L194 = (0, import_lib4.$L)("protected");
+var $L195 = (0, import_lib4.$L)("||>");
+var $L196 = (0, import_lib4.$L)("|\u25B7");
+var $L197 = (0, import_lib4.$L)("|>=");
+var $L198 = (0, import_lib4.$L)("\u25B7=");
+var $L199 = (0, import_lib4.$L)("|>");
+var $L200 = (0, import_lib4.$L)("\u25B7");
+var $L201 = (0, import_lib4.$L)("readonly");
+var $L202 = (0, import_lib4.$L)("return");
+var $L203 = (0, import_lib4.$L)("satisfies");
+var $L204 = (0, import_lib4.$L)("'");
+var $L205 = (0, import_lib4.$L)("static");
+var $L206 = (0, import_lib4.$L)("${");
+var $L207 = (0, import_lib4.$L)("super");
+var $L208 = (0, import_lib4.$L)("switch");
+var $L209 = (0, import_lib4.$L)("target");
+var $L210 = (0, import_lib4.$L)("then");
+var $L211 = (0, import_lib4.$L)("this");
+var $L212 = (0, import_lib4.$L)("throw");
+var $L213 = (0, import_lib4.$L)('"""');
+var $L214 = (0, import_lib4.$L)("'''");
+var $L215 = (0, import_lib4.$L)("///");
+var $L216 = (0, import_lib4.$L)("```");
+var $L217 = (0, import_lib4.$L)("try");
+var $L218 = (0, import_lib4.$L)("typeof");
+var $L219 = (0, import_lib4.$L)("undefined");
+var $L220 = (0, import_lib4.$L)("unless");
+var $L221 = (0, import_lib4.$L)("until");
+var $L222 = (0, import_lib4.$L)("using");
+var $L223 = (0, import_lib4.$L)("void");
+var $L224 = (0, import_lib4.$L)("when");
+var $L225 = (0, import_lib4.$L)("while");
+var $L226 = (0, import_lib4.$L)("yield");
+var $L227 = (0, import_lib4.$L)("/>");
+var $L228 = (0, import_lib4.$L)("</");
+var $L229 = (0, import_lib4.$L)("<>");
+var $L230 = (0, import_lib4.$L)("</>");
+var $L231 = (0, import_lib4.$L)("<!--");
+var $L232 = (0, import_lib4.$L)("-->");
+var $L233 = (0, import_lib4.$L)("type");
+var $L234 = (0, import_lib4.$L)("enum");
+var $L235 = (0, import_lib4.$L)("interface");
+var $L236 = (0, import_lib4.$L)("global");
+var $L237 = (0, import_lib4.$L)("module");
+var $L238 = (0, import_lib4.$L)("namespace");
+var $L239 = (0, import_lib4.$L)("asserts");
+var $L240 = (0, import_lib4.$L)("keyof");
+var $L241 = (0, import_lib4.$L)("???");
+var $L242 = (0, import_lib4.$L)("unique");
+var $L243 = (0, import_lib4.$L)("symbol");
+var $L244 = (0, import_lib4.$L)("[]");
+var $L245 = (0, import_lib4.$L)("civet");
 var $R0 = (0, import_lib4.$R)(new RegExp("(?=async|debugger|if|unless|comptime|do|for|loop|until|while|switch|throw|try)", "suy"));
 var $R1 = (0, import_lib4.$R)(new RegExp("&(?=\\s)", "suy"));
-var $R2 = (0, import_lib4.$R)(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
+var $R2 = (0, import_lib4.$R)(new RegExp("(as|of|by|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
 var $R3 = (0, import_lib4.$R)(new RegExp("[0-9]", "suy"));
 var $R4 = (0, import_lib4.$R)(new RegExp("(?!\\p{ID_Start}|[_$0-9(\\[{])", "suy"));
 var $R5 = (0, import_lib4.$R)(new RegExp("[ \\t]", "suy"));
@@ -8618,12 +8910,7 @@ var StatementExpression$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(IfStatement
     return $skip;
   return $1;
 });
-var StatementExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(IterationExpression), function($skip, $loc, $0, $1) {
-  if ($1.block.implicit && $1.subtype !== "DoStatement" && $1.subtype !== "ComptimeStatement") {
-    return $skip;
-  }
-  return $1;
-});
+var StatementExpression$2 = IterationExpression;
 var StatementExpression$3 = SwitchStatement;
 var StatementExpression$4 = ThrowStatement;
 var StatementExpression$5 = TryStatement;
@@ -8721,7 +9008,7 @@ var ForbiddenImplicitCalls$$ = [ForbiddenImplicitCalls$0, ForbiddenImplicitCalls
 function ForbiddenImplicitCalls(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ForbiddenImplicitCalls", ForbiddenImplicitCalls$$);
 }
-var ReservedBinary$0 = (0, import_lib4.$R$0)((0, import_lib4.$EXPECT)($R2, "ReservedBinary /(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
+var ReservedBinary$0 = (0, import_lib4.$R$0)((0, import_lib4.$EXPECT)($R2, "ReservedBinary /(as|of|by|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])/"));
 function ReservedBinary(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ReservedBinary", ReservedBinary$0);
 }
@@ -9352,7 +9639,7 @@ var PipelineHeadItem$$ = [PipelineHeadItem$0, PipelineHeadItem$1];
 function PipelineHeadItem(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "PipelineHeadItem", PipelineHeadItem$$);
 }
-var PipelineTailItem$0 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$C)(AwaitOp, Yield, Return), (0, import_lib4.$N)(AccessStart)), function(value) {
+var PipelineTailItem$0 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$C)(AwaitOp, Yield, Return, Throw), (0, import_lib4.$N)(AccessStart), (0, import_lib4.$N)(MaybeNestedExpression)), function(value) {
   return value[0];
 });
 var PipelineTailItem$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'PipelineTailItem "import"'), (0, import_lib4.$N)(AccessStart)), function($skip, $loc, $0, $1, $2) {
@@ -11759,16 +12046,31 @@ var CoffeeScriptBooleanLiteral$$ = [CoffeeScriptBooleanLiteral$0, CoffeeScriptBo
 function CoffeeScriptBooleanLiteral(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "CoffeeScriptBooleanLiteral", CoffeeScriptBooleanLiteral$$);
 }
-var SymbolLiteral$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Colon, IdentifierName), function($skip, $loc, $0, $1, $2) {
+var SymbolLiteral$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Colon, (0, import_lib4.$C)(IdentifierName, StringLiteral)), function($skip, $loc, $0, $1, $2) {
   var colon = $1;
   var id = $2;
-  const { name, children: [token] } = id;
+  let name, token;
+  if (id.type === "Identifier") {
+    ({ name, children: [token] } = id);
+  } else {
+    name = literalValue({
+      type: "Literal",
+      subtype: "StringLiteral",
+      raw: id.token,
+      children: [id]
+    });
+    token = id;
+  }
   if (config.symbols.includes(name)) {
     return {
       type: "SymbolLiteral",
-      children: [
+      children: id.type === "Identifier" ? [
         { ...colon, token: "Symbol." },
         token
+      ] : [
+        { ...colon, token: "Symbol[" },
+        token,
+        "]"
       ],
       name
     };
@@ -11776,9 +12078,9 @@ var SymbolLiteral$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Colon, Identifier
     return {
       type: "SymbolLiteral",
       children: [
-        { ...colon, token: 'Symbol.for("' },
-        token,
-        '")'
+        { ...colon, token: "Symbol.for(" },
+        id.type === "Identifier" ? ['"', token, '"'] : token,
+        ")"
       ],
       name
     };
@@ -13421,6 +13723,8 @@ var Statement$2 = (0, import_lib4.$T)((0, import_lib4.$S)(IfStatement, (0, impor
 var Statement$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(IterationStatement, (0, import_lib4.$N)(ShouldExpressionize)), function($skip, $loc, $0, $1, $2) {
   if ($1.generator)
     return $skip;
+  if ($1.reduction)
+    return $skip;
   return $1;
 });
 var Statement$4 = (0, import_lib4.$T)((0, import_lib4.$S)(SwitchStatement, (0, import_lib4.$N)(ShouldExpressionize)), function(value) {
@@ -13466,7 +13770,7 @@ function EmptyStatement(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "EmptyStatement", EmptyStatement$0);
 }
 var InsertEmptyStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertSemicolon), function($skip, $loc, $0, $1) {
-  return { type: "EmptyStatement", children: [$1] };
+  return { type: "EmptyStatement", children: [$1], implicit: true };
 });
 function InsertEmptyStatement(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "InsertEmptyStatement", InsertEmptyStatement$0);
@@ -13772,15 +14076,19 @@ var ForClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(For, (0, import_lib4.
     block: null,
     blockPrefix: c.blockPrefix,
     hoistDec: c.hoistDec,
+    reduction: c.reduction,
     generator
   };
 });
 function ForClause(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ForClause", ForClause$0);
 }
-var ForStatementControlWithWhen$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForStatementControl, (0, import_lib4.$E)(WhenCondition)), function($skip, $loc, $0, $1, $2) {
-  var control = $1;
-  var condition = $2;
+var ForStatementControlWithWhen$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(ForReduction), ForStatementControl, (0, import_lib4.$E)(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
+  var reduction = $1;
+  var control = $2;
+  var condition = $3;
+  if (reduction)
+    control = { ...control, reduction };
   if (!condition)
     return control;
   const expressions = [["", {
@@ -13796,7 +14104,7 @@ var ForStatementControlWithWhen$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(For
   return {
     ...control,
     blockPrefix: [
-      ...control.blockPrefix,
+      ...control.blockPrefix ?? [],
       ["", {
         type: "IfStatement",
         then: block,
@@ -13808,6 +14116,18 @@ var ForStatementControlWithWhen$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(For
 function ForStatementControlWithWhen(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ForStatementControlWithWhen", ForStatementControlWithWhen$0);
 }
+var ForReduction$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L120, 'ForReduction "some"'), (0, import_lib4.$EXPECT)($L121, 'ForReduction "every"'), (0, import_lib4.$EXPECT)($L122, 'ForReduction "count"'), (0, import_lib4.$EXPECT)($L123, 'ForReduction "sum"'), (0, import_lib4.$EXPECT)($L124, 'ForReduction "product"'), (0, import_lib4.$EXPECT)($L125, 'ForReduction "min"'), (0, import_lib4.$EXPECT)($L126, 'ForReduction "max"')), NonIdContinue, __), function($skip, $loc, $0, $1, $2, $3) {
+  var subtype = $1;
+  var ws = $3;
+  return {
+    type: "ForReduction",
+    subtype,
+    children: [ws]
+  };
+});
+function ForReduction(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "ForReduction", ForReduction$0);
+}
 var ForStatementControl$0 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$N)(CoffeeForLoopsEnabled), ForStatementParameters), function(value) {
   return value[1];
 });
@@ -13861,7 +14181,7 @@ var CoffeeForStatementParameters$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0
     const counterRef = makeRef("i");
     const lenRef = makeRef("len");
     if (exp.type === "RangeExpression") {
-      return forRange(open, declaration, exp, step?.[2], close);
+      return forRange(open, declaration, exp, step && prepend(trimFirstSpace(step[0]), trimFirstSpace(step[2])), close);
     }
     const expRef = maybeRef(exp);
     const varRef = declaration;
@@ -13963,10 +14283,10 @@ var ForStatementParameters$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertOp
   };
 });
 var ForStatementParameters$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(Await, __)), (0, import_lib4.$E)((0, import_lib4.$S)((0, import_lib4.$C)(Each, Own), __)), (0, import_lib4.$S)(OpenParen, __), ForInOfDeclaration, (0, import_lib4.$E)((0, import_lib4.$S)(__, Comma, __, ForInOfDeclaration)), __, (0, import_lib4.$C)(In, Of), ExpressionWithObjectApplicationForbidden, (0, import_lib4.$E)((0, import_lib4.$S)(__, By, ExpressionWithObjectApplicationForbidden)), (0, import_lib4.$S)(__, CloseParen)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
-  return processForInOf($0, getHelperRef);
+  return processForInOf($0);
 });
 var ForStatementParameters$3 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(Await, __)), (0, import_lib4.$E)((0, import_lib4.$S)((0, import_lib4.$C)(Each, Own), __)), InsertOpenParen, ForInOfDeclaration, (0, import_lib4.$E)((0, import_lib4.$S)(__, Comma, __, ForInOfDeclaration)), __, (0, import_lib4.$C)(In, Of), ExpressionWithObjectApplicationForbidden, (0, import_lib4.$E)((0, import_lib4.$S)(__, By, ExpressionWithObjectApplicationForbidden)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
-  return processForInOf($0, getHelperRef);
+  return processForInOf($0);
 });
 var ForStatementParameters$4 = ForRangeParameters;
 var ForStatementParameters$$ = [ForStatementParameters$0, ForStatementParameters$1, ForStatementParameters$2, ForStatementParameters$3, ForStatementParameters$4];
@@ -14003,7 +14323,7 @@ var ForDeclaration$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(LetOrConstOrVar,
   return {
     type: "ForDeclaration",
     children: [c, binding],
-    declare: c,
+    decl: c.token,
     binding,
     names: binding.names
   };
@@ -14014,7 +14334,7 @@ var ForDeclaration$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(InsertConst, (0,
   return {
     type: "ForDeclaration",
     children: [c, binding],
-    declare: c,
+    decl: c.token,
     binding,
     names: binding.names
   };
@@ -14734,19 +15054,19 @@ var ThrowStatement$0 = (0, import_lib4.$T)((0, import_lib4.$S)(Throw, MaybeParen
 function ThrowStatement(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ThrowStatement", ThrowStatement$0);
 }
-var Break$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L120, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Break$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L127, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Break(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Break", Break$0);
 }
-var Continue$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L121, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Continue$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L128, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Continue(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Continue", Continue$0);
 }
-var Debugger$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L122, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Debugger$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L129, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Debugger(ctx, state2) {
@@ -14814,7 +15134,7 @@ var MaybeParenNestedExpression$$ = [MaybeParenNestedExpression$0, MaybeParenNest
 function MaybeParenNestedExpression(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "MaybeParenNestedExpression", MaybeParenNestedExpression$$);
 }
-var ImportDeclaration$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, Identifier, (0, import_lib4.$E)(_), Equals, __, (0, import_lib4.$EXPECT)($L123, 'ImportDeclaration "require"'), NonIdContinue, Arguments), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var ImportDeclaration$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, Identifier, (0, import_lib4.$E)(_), Equals, __, (0, import_lib4.$EXPECT)($L130, '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 }
@@ -15004,7 +15324,7 @@ var ImpliedFrom$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L0, 'ImpliedF
 function ImpliedFrom(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
 }
-var ImportAssertion$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L124, 'ImportAssertion "with"'), (0, import_lib4.$EXPECT)($L125, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib4.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var ImportAssertion$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L131, 'ImportAssertion "with"'), (0, import_lib4.$EXPECT)($L132, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib4.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var keyword = $2;
   var object = $5;
   return {
@@ -15323,19 +15643,19 @@ var LexicalDeclaration$$ = [LexicalDeclaration$0, LexicalDeclaration$1];
 function LexicalDeclaration(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "LexicalDeclaration", LexicalDeclaration$$);
 }
-var ConstAssignment$0 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L126, 'ConstAssignment ":="'), (0, import_lib4.$EXPECT)($L127, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
+var ConstAssignment$0 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L133, 'ConstAssignment ":="'), (0, import_lib4.$EXPECT)($L134, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
   return { $loc, token: "=", decl: "const " };
 });
 function ConstAssignment(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ConstAssignment", ConstAssignment$0);
 }
-var LetAssignment$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L128, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+var LetAssignment$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L135, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
   return { $loc, token: "=", decl: "let " };
 });
 function LetAssignment(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "LetAssignment", LetAssignment$0);
 }
-var TypeAssignment$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L129, 'TypeAssignment "::="'), function($skip, $loc, $0, $1) {
+var TypeAssignment$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L136, 'TypeAssignment "::="'), function($skip, $loc, $0, $1) {
   return { $loc, token: "=" };
 });
 function TypeAssignment(ctx, state2) {
@@ -15758,7 +16078,7 @@ var MultiLineComment$$ = [MultiLineComment$0, MultiLineComment$1];
 function MultiLineComment(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "MultiLineComment", MultiLineComment$$);
 }
-var JSMultiLineComment$0 = (0, import_lib4.$TV)((0, import_lib4.$TEXT)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L130, 'JSMultiLineComment "/*"'), (0, import_lib4.$Q)((0, import_lib4.$S)((0, import_lib4.$N)((0, import_lib4.$EXPECT)($L131, 'JSMultiLineComment "*/"')), (0, import_lib4.$EXPECT)($R67, "JSMultiLineComment /./"))), (0, import_lib4.$EXPECT)($L131, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+var JSMultiLineComment$0 = (0, import_lib4.$TV)((0, import_lib4.$TEXT)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L137, 'JSMultiLineComment "/*"'), (0, import_lib4.$Q)((0, import_lib4.$S)((0, import_lib4.$N)((0, import_lib4.$EXPECT)($L138, 'JSMultiLineComment "*/"')), (0, import_lib4.$EXPECT)($R67, "JSMultiLineComment /./"))), (0, import_lib4.$EXPECT)($L138, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
   return { type: "Comment", $loc, token: $1 };
 });
 function JSMultiLineComment(ctx, state2) {
@@ -15804,7 +16124,7 @@ function _(ctx, state2) {
 var NonNewlineWhitespace$0 = (0, import_lib4.$TR)((0, import_lib4.$EXPECT)($R22, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
-var NonNewlineWhitespace$1 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L132, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
+var NonNewlineWhitespace$1 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L139, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
   return " ";
 });
 var NonNewlineWhitespace$$ = [NonNewlineWhitespace$0, NonNewlineWhitespace$1];
@@ -15850,7 +16170,7 @@ function SimpleStatementDelimiter(ctx, state2) {
 }
 var StatementDelimiter$0 = (0, import_lib4.$Y)(EOS);
 var StatementDelimiter$1 = SemicolonDelimiter;
-var StatementDelimiter$2 = (0, import_lib4.$Y)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L37, 'StatementDelimiter "}"'), (0, import_lib4.$EXPECT)($L133, 'StatementDelimiter ")"'), (0, import_lib4.$EXPECT)($L46, 'StatementDelimiter "]"'))));
+var StatementDelimiter$2 = (0, import_lib4.$Y)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L37, 'StatementDelimiter "}"'), (0, import_lib4.$EXPECT)($L140, 'StatementDelimiter ")"'), (0, import_lib4.$EXPECT)($L46, 'StatementDelimiter "]"'))));
 var StatementDelimiter$$ = [StatementDelimiter$0, StatementDelimiter$1, StatementDelimiter$2];
 function StatementDelimiter(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "StatementDelimiter", StatementDelimiter$$);
@@ -15874,7 +16194,7 @@ var Loc$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L0, 'Loc ""'), functi
 function Loc(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Loc", Loc$0);
 }
-var Abstract$0 = (0, import_lib4.$TV)((0, import_lib4.$TEXT)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L134, 'Abstract "abstract"'), NonIdContinue, (0, import_lib4.$E)((0, import_lib4.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+var Abstract$0 = (0, import_lib4.$TV)((0, import_lib4.$TEXT)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L141, 'Abstract "abstract"'), NonIdContinue, (0, import_lib4.$E)((0, import_lib4.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1, ts: true };
 });
 function Abstract(ctx, state2) {
@@ -15886,43 +16206,43 @@ var Ampersand$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L117, 'Ampersan
 function Ampersand(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Ampersand", Ampersand$0);
 }
-var As$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L135, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var As$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L142, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function As(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "As", As$0);
 }
-var At$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L136, 'At "@"'), function($skip, $loc, $0, $1) {
+var At$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L143, 'At "@"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function At(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "At", At$0);
 }
-var AtAt$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L137, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+var AtAt$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L144, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "@" };
 });
 function AtAt(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "AtAt", AtAt$0);
 }
-var Async$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L138, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Async$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L145, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Async" };
 });
 function Async(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Async", Async$0);
 }
-var Await$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L139, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Await$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L146, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Await" };
 });
 function Await(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Await", Await$0);
 }
-var Backtick$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L140, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+var Backtick$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L147, 'Backtick "`"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Backtick(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Backtick", Backtick$0);
 }
-var By$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L141, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var By$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L148, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function By(ctx, state2) {
@@ -15934,19 +16254,19 @@ var Caret$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L22, 'Caret "^"'),
 function Caret(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Caret", Caret$0);
 }
-var Case$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L142, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Case$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L149, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Case(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Case", Case$0);
 }
-var Catch$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L143, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Catch$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L150, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Catch(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Catch", Catch$0);
 }
-var Class$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L144, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Class$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L151, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Class(ctx, state2) {
@@ -15970,13 +16290,13 @@ var CloseBracket$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L46, 'CloseB
 function CloseBracket(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "CloseBracket", CloseBracket$0);
 }
-var CloseParen$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L133, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+var CloseParen$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L140, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function CloseParen(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "CloseParen", CloseParen$0);
 }
-var CoffeeSubstitutionStart$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L145, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+var CoffeeSubstitutionStart$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L152, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "${" };
 });
 function CoffeeSubstitutionStart(ctx, state2) {
@@ -15994,37 +16314,37 @@ var Comma$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L17, 'Comma ","'),
 function Comma(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Comma", Comma$0);
 }
-var Comptime$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L146, 'Comptime "comptime"'), NonIdContinue, (0, import_lib4.$N)((0, import_lib4.$EXPECT)($L16, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
+var Comptime$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L153, 'Comptime "comptime"'), NonIdContinue, (0, import_lib4.$N)((0, import_lib4.$EXPECT)($L16, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: $1 };
 });
 function Comptime(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Comptime", Comptime$0);
 }
-var ConstructorShorthand$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L136, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+var ConstructorShorthand$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L143, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "constructor" };
 });
 function ConstructorShorthand(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ConstructorShorthand", ConstructorShorthand$0);
 }
-var Declare$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L147, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Declare$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L154, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Declare(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Declare", Declare$0);
 }
-var Default$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L148, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Default$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L155, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Default(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Default", Default$0);
 }
-var Delete$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L149, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Delete$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L156, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Delete(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Delete", Delete$0);
 }
-var Do$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L150, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Do$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L157, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Do(ctx, state2) {
@@ -16044,51 +16364,51 @@ var Dot$$ = [Dot$0, Dot$1];
 function Dot(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "Dot", Dot$$);
 }
-var DotDot$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L151, 'DotDot ".."'), (0, import_lib4.$N)((0, import_lib4.$EXPECT)($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
+var DotDot$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L158, 'DotDot ".."'), (0, import_lib4.$N)((0, import_lib4.$EXPECT)($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
-var DotDot$1 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L152, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
+var DotDot$1 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L159, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
   return { $loc, token: ".." };
 });
 var DotDot$$ = [DotDot$0, DotDot$1];
 function DotDot(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "DotDot", DotDot$$);
 }
-var DotDotDot$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L153, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+var DotDotDot$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L160, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
-var DotDotDot$1 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L154, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
+var DotDotDot$1 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L161, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "..." };
 });
 var DotDotDot$$ = [DotDotDot$0, DotDotDot$1];
 function DotDotDot(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "DotDotDot", DotDotDot$$);
 }
-var DoubleColon$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L155, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+var DoubleColon$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L162, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function DoubleColon(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "DoubleColon", DoubleColon$0);
 }
-var DoubleColonAsColon$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L155, 'DoubleColonAsColon "::"'), function($skip, $loc, $0, $1) {
+var DoubleColonAsColon$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L162, 'DoubleColonAsColon "::"'), function($skip, $loc, $0, $1) {
   return { $loc, token: ":" };
 });
 function DoubleColonAsColon(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "DoubleColonAsColon", DoubleColonAsColon$0);
 }
-var DoubleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L156, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+var DoubleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L163, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function DoubleQuote(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "DoubleQuote", DoubleQuote$0);
 }
-var Each$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L157, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Each$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L164, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Each(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Each", Each$0);
 }
-var Else$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L158, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Else$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L165, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Else(ctx, state2) {
@@ -16100,61 +16420,61 @@ var Equals$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L3, 'Equals "="'),
 function Equals(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Equals", Equals$0);
 }
-var ExclamationPoint$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L159, 'ExclamationPoint "!"'), function($skip, $loc, $0, $1) {
+var ExclamationPoint$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L166, 'ExclamationPoint "!"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function ExclamationPoint(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ExclamationPoint", ExclamationPoint$0);
 }
-var Export$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L160, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Export$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L167, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Export(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Export", Export$0);
 }
-var Extends$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L161, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Extends$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L168, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Extends(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Extends", Extends$0);
 }
-var Finally$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L162, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Finally$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L169, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Finally(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Finally", Finally$0);
 }
-var For$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L163, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var For$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L170, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function For(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "For", For$0);
 }
-var From$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L164, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var From$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L171, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function From(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "From", From$0);
 }
-var Function$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L165, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Function$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L172, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Function2(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Function", Function$0);
 }
-var GetOrSet$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L166, 'GetOrSet "get"'), (0, import_lib4.$EXPECT)($L167, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var GetOrSet$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L173, 'GetOrSet "get"'), (0, import_lib4.$EXPECT)($L174, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "GetOrSet" };
 });
 function GetOrSet(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "GetOrSet", GetOrSet$0);
 }
-var Hash$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L168, 'Hash "#"'), function($skip, $loc, $0, $1) {
+var Hash$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L175, 'Hash "#"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Hash(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Hash", Hash$0);
 }
-var If$0 = (0, import_lib4.$TV)((0, import_lib4.$TEXT)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L169, 'If "if"'), NonIdContinue, (0, import_lib4.$E)((0, import_lib4.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
+var If$0 = (0, import_lib4.$TV)((0, import_lib4.$TEXT)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L176, 'If "if"'), NonIdContinue, (0, import_lib4.$E)((0, import_lib4.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function If(ctx, state2) {
@@ -16166,67 +16486,67 @@ var Import$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)
 function Import(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Import", Import$0);
 }
-var In$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L170, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var In$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L177, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function In(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "In", In$0);
 }
-var Infer$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L171, 'Infer "infer"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Infer$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L178, 'Infer "infer"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Infer(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Infer", Infer$0);
 }
-var LetOrConst$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L172, 'LetOrConst "let"'), (0, import_lib4.$EXPECT)($L173, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LetOrConst$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L179, 'LetOrConst "let"'), (0, import_lib4.$EXPECT)($L180, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function LetOrConst(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "LetOrConst", LetOrConst$0);
 }
-var Const$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L173, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Const$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L180, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Const(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Const", Const$0);
 }
-var Is$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L174, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Is$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L181, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Is(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Is", Is$0);
 }
-var LetOrConstOrVar$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L172, 'LetOrConstOrVar "let"'), (0, import_lib4.$EXPECT)($L173, 'LetOrConstOrVar "const"'), (0, import_lib4.$EXPECT)($L175, 'LetOrConstOrVar "var"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LetOrConstOrVar$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L179, 'LetOrConstOrVar "let"'), (0, import_lib4.$EXPECT)($L180, 'LetOrConstOrVar "const"'), (0, import_lib4.$EXPECT)($L182, 'LetOrConstOrVar "var"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function LetOrConstOrVar(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "LetOrConstOrVar", LetOrConstOrVar$0);
 }
-var Like$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L176, 'Like "like"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Like$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L183, 'Like "like"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Like(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Like", Like$0);
 }
-var Loop$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L177, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Loop$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L184, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: "while" };
 });
 function Loop(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Loop", Loop$0);
 }
-var New$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L178, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var New$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L185, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function New(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "New", New$0);
 }
-var Not$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L179, 'Not "not"'), NonIdContinue, (0, import_lib4.$N)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$EXPECT)($L16, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+var Not$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L186, 'Not "not"'), NonIdContinue, (0, import_lib4.$N)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$EXPECT)($L16, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: "!" };
 });
 function Not(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Not", Not$0);
 }
-var Of$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L180, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Of$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L187, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Of(ctx, state2) {
@@ -16244,7 +16564,7 @@ var OpenBrace$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L1, 'OpenBrace
 function OpenBrace(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "OpenBrace", OpenBrace$0);
 }
-var OpenBracket$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L181, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+var OpenBracket$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L188, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function OpenBracket(ctx, state2) {
@@ -16256,49 +16576,49 @@ var OpenParen$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L4, 'OpenParen
 function OpenParen(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "OpenParen", OpenParen$0);
 }
-var Operator$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L182, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Operator$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L189, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Operator(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Operator", Operator$0);
 }
-var Override$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L183, 'Override "override"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Override$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L190, 'Override "override"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, ts: true };
 });
 function Override(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Override", Override$0);
 }
-var Own$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L184, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Own$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L191, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Own(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Own", Own$0);
 }
-var Public$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L185, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Public$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L192, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Public(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Public", Public$0);
 }
-var Private$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L186, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Private$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L193, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Private(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Private", Private$0);
 }
-var Protected$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L187, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Protected$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L194, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Protected(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Protected", Protected$0);
 }
-var Pipe$0 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L188, 'Pipe "||>"'), (0, import_lib4.$EXPECT)($L189, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
+var Pipe$0 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L195, 'Pipe "||>"'), (0, import_lib4.$EXPECT)($L196, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
   return { $loc, token: "||>" };
 });
-var Pipe$1 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L190, 'Pipe "|>="'), (0, import_lib4.$EXPECT)($L191, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
+var Pipe$1 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L197, 'Pipe "|>="'), (0, import_lib4.$EXPECT)($L198, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
   return { $loc, token: "|>=" };
 });
-var Pipe$2 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L192, 'Pipe "|>"'), (0, import_lib4.$EXPECT)($L193, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
+var Pipe$2 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L199, 'Pipe "|>"'), (0, import_lib4.$EXPECT)($L200, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
   return { $loc, token: "|>" };
 });
 var Pipe$$ = [Pipe$0, Pipe$1, Pipe$2];
@@ -16311,19 +16631,19 @@ var QuestionMark$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L6, 'Questio
 function QuestionMark(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "QuestionMark", QuestionMark$0);
 }
-var Readonly$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L194, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Readonly$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L201, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, ts: true };
 });
 function Readonly(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Readonly", Readonly$0);
 }
-var Return$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L195, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Return$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L202, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Return(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Return", Return$0);
 }
-var Satisfies$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L196, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Satisfies$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L203, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Satisfies(ctx, state2) {
@@ -16335,7 +16655,7 @@ var Semicolon$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L119, 'Semicolo
 function Semicolon(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Semicolon", Semicolon$0);
 }
-var SingleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L197, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+var SingleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L204, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function SingleQuote(ctx, state2) {
@@ -16347,149 +16667,149 @@ var Star$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L75, 'Star "*"'), fu
 function Star(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Star", Star$0);
 }
-var Static$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L198, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Static$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L205, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
-var Static$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L136, 'Static "@"'), (0, import_lib4.$N)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L4, 'Static "("'), (0, import_lib4.$EXPECT)($L136, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+var Static$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L143, 'Static "@"'), (0, import_lib4.$N)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L4, 'Static "("'), (0, import_lib4.$EXPECT)($L143, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: "static " };
 });
 var Static$$ = [Static$0, Static$1];
 function Static(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "Static", Static$$);
 }
-var SubstitutionStart$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L199, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+var SubstitutionStart$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L206, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function SubstitutionStart(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "SubstitutionStart", SubstitutionStart$0);
 }
-var Super$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L200, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Super$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L207, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Super(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Super", Super$0);
 }
-var Switch$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L201, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Switch$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L208, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Switch(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Switch", Switch$0);
 }
-var Target$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L202, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Target$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L209, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Target(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Target", Target$0);
 }
-var Then$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(__, (0, import_lib4.$EXPECT)($L203, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+var Then$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(__, (0, import_lib4.$EXPECT)($L210, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: "" };
 });
 function Then(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Then", Then$0);
 }
-var This$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L204, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var This$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L211, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function This(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "This", This$0);
 }
-var Throw$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L205, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Throw$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L212, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Throw(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Throw", Throw$0);
 }
-var TripleDoubleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L206, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+var TripleDoubleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L213, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
   return { $loc, token: "`" };
 });
 function TripleDoubleQuote(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TripleDoubleQuote", TripleDoubleQuote$0);
 }
-var TripleSingleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L207, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+var TripleSingleQuote$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L214, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
   return { $loc, token: "`" };
 });
 function TripleSingleQuote(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TripleSingleQuote", TripleSingleQuote$0);
 }
-var TripleSlash$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L208, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+var TripleSlash$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L215, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "/" };
 });
 function TripleSlash(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TripleSlash", TripleSlash$0);
 }
-var TripleTick$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L209, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+var TripleTick$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L216, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "`" };
 });
 function TripleTick(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TripleTick", TripleTick$0);
 }
-var Try$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L210, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Try$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L217, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Try(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Try", Try$0);
 }
-var Typeof$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L211, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Typeof$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L218, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Typeof(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Typeof", Typeof$0);
 }
-var Undefined$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L212, 'Undefined "undefined"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Undefined$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L219, 'Undefined "undefined"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Undefined(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Undefined", Undefined$0);
 }
-var Unless$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L213, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Unless$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L220, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, negated: true };
 });
 function Unless(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Unless", Unless$0);
 }
-var Until$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L214, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Until$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L221, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, negated: true };
 });
 function Until(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Until", Until$0);
 }
-var Using$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L215, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Using$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L222, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Using(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Using", Using$0);
 }
-var Var$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L175, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Var$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L182, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Var(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Var", Var$0);
 }
-var Void$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L216, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Void$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L223, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Void(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Void", Void$0);
 }
-var When$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L217, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var When$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L224, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: "case" };
 });
 function When(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "When", When$0);
 }
-var While$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L218, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var While$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L225, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function While(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "While", While$0);
 }
-var With$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L124, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var With$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L131, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function With(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "With", With$0);
 }
-var Yield$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L219, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Yield$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L226, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Yield" };
 });
 function Yield(ctx, state2) {
@@ -16508,7 +16828,7 @@ var JSXImplicitFragment$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(JSXTag, (0,
     ],
     jsxChildren: [$1].concat($2.map(([, tag]) => tag))
   };
-  const type = typeOfJSX(jsx, config, getHelperRef);
+  const type = typeOfJSX(jsx, config);
   return type ? [
     { ts: true, children: ["("] },
     jsx,
@@ -16568,7 +16888,7 @@ var JSXElement$$ = [JSXElement$0, JSXElement$1, JSXElement$2];
 function JSXElement(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
 }
-var JSXSelfClosingElement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib4.$E)(TypeArguments), (0, import_lib4.$E)(JSXAttributes), (0, import_lib4.$E)(Whitespace), (0, import_lib4.$EXPECT)($L220, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var JSXSelfClosingElement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib4.$E)(TypeArguments), (0, import_lib4.$E)(JSXAttributes), (0, import_lib4.$E)(Whitespace), (0, import_lib4.$EXPECT)($L227, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   return { type: "JSXElement", children: $0, tag: $2 };
 });
 function JSXSelfClosingElement(ctx, state2) {
@@ -16602,7 +16922,7 @@ var JSXOptionalClosingElement$$ = [JSXOptionalClosingElement$0, JSXOptionalClosi
 function JSXOptionalClosingElement(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "JSXOptionalClosingElement", JSXOptionalClosingElement$$);
 }
-var JSXClosingElement$0 = (0, import_lib4.$S)((0, import_lib4.$EXPECT)($L221, 'JSXClosingElement "</"'), (0, import_lib4.$E)(Whitespace), JSXElementName, (0, import_lib4.$E)(Whitespace), (0, import_lib4.$EXPECT)($L45, 'JSXClosingElement ">"'));
+var JSXClosingElement$0 = (0, import_lib4.$S)((0, import_lib4.$EXPECT)($L228, 'JSXClosingElement "</"'), (0, import_lib4.$E)(Whitespace), JSXElementName, (0, import_lib4.$E)(Whitespace), (0, import_lib4.$EXPECT)($L45, 'JSXClosingElement ">"'));
 function JSXClosingElement(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "JSXClosingElement", JSXClosingElement$0);
 }
@@ -16623,7 +16943,7 @@ var JSXFragment$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$N)
   ];
   return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
 });
-var JSXFragment$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(CoffeeJSXEnabled, (0, import_lib4.$EXPECT)($L222, 'JSXFragment "<>"'), (0, import_lib4.$E)(JSXChildren), (0, import_lib4.$E)(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var JSXFragment$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(CoffeeJSXEnabled, (0, import_lib4.$EXPECT)($L229, 'JSXFragment "<>"'), (0, import_lib4.$E)(JSXChildren), (0, import_lib4.$E)(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var children = $3;
   $0 = $0.slice(1);
   return {
@@ -16636,7 +16956,7 @@ var JSXFragment$$ = [JSXFragment$0, JSXFragment$1];
 function JSXFragment(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "JSXFragment", JSXFragment$$);
 }
-var PushJSXOpeningFragment$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L222, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+var PushJSXOpeningFragment$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L229, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
   state.JSXTagStack.push("");
   return $1;
 });
@@ -16653,11 +16973,11 @@ var JSXOptionalClosingFragment$$ = [JSXOptionalClosingFragment$0, JSXOptionalClo
 function JSXOptionalClosingFragment(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "JSXOptionalClosingFragment", JSXOptionalClosingFragment$$);
 }
-var JSXClosingFragment$0 = (0, import_lib4.$EXPECT)($L223, 'JSXClosingFragment "</>"');
+var JSXClosingFragment$0 = (0, import_lib4.$EXPECT)($L230, 'JSXClosingFragment "</>"');
 function JSXClosingFragment(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "JSXClosingFragment", JSXClosingFragment$0);
 }
-var JSXElementName$0 = (0, import_lib4.$TV)((0, import_lib4.$Y)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L168, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
+var JSXElementName$0 = (0, import_lib4.$TV)((0, import_lib4.$Y)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L175, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
   return config.defaultElement;
 });
 var JSXElementName$1 = (0, import_lib4.$TEXT)((0, import_lib4.$S)(JSXIdentifierName, (0, import_lib4.$C)((0, import_lib4.$S)(Colon, JSXIdentifierName), (0, import_lib4.$Q)((0, import_lib4.$S)(Dot, JSXIdentifierName)))));
@@ -16835,7 +17155,7 @@ var JSXAttribute$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(Identifier, (0, im
   }
   return $skip;
 });
-var JSXAttribute$5 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L168, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+var JSXAttribute$5 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L175, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
   return [" ", "id=", $2];
 });
 var JSXAttribute$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
@@ -17180,7 +17500,7 @@ var JSXChildGeneral$$ = [JSXChildGeneral$0, JSXChildGeneral$1, JSXChildGeneral$2
 function JSXChildGeneral(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "JSXChildGeneral", JSXChildGeneral$$);
 }
-var JSXComment$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L224, 'JSXComment "<!--"'), JSXCommentContent, (0, import_lib4.$EXPECT)($L225, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+var JSXComment$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L231, 'JSXComment "<!--"'), JSXCommentContent, (0, import_lib4.$EXPECT)($L232, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
   return ["{/*", $2, "*/}"];
 });
 function JSXComment(ctx, state2) {
@@ -17468,37 +17788,37 @@ var InterfaceExtendsTarget$0 = ImplementsTarget;
 function InterfaceExtendsTarget(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "InterfaceExtendsTarget", InterfaceExtendsTarget$0);
 }
-var TypeKeyword$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L226, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var TypeKeyword$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L233, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function TypeKeyword(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TypeKeyword", TypeKeyword$0);
 }
-var Enum$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L227, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Enum$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L234, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Enum(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Enum", Enum$0);
 }
-var Interface$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L228, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Interface$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L235, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Interface(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Interface", Interface$0);
 }
-var Global$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L229, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Global$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L236, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Global(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Global", Global$0);
 }
-var Module$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L230, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Module$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L237, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Module(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "Module", Module$0);
 }
-var Namespace$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L231, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Namespace$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L238, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Namespace(ctx, state2) {
@@ -17812,14 +18132,14 @@ var ReturnTypeSuffix$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib
 function ReturnTypeSuffix(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "ReturnTypeSuffix", ReturnTypeSuffix$0);
 }
-var ReturnType$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(__, (0, import_lib4.$EXPECT)($L232, 'ReturnType "asserts"'), NonIdContinue)), ForbidIndentedApplication, (0, import_lib4.$E)(TypePredicate), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ReturnType$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(__, (0, import_lib4.$EXPECT)($L239, 'ReturnType "asserts"'), NonIdContinue)), ForbidIndentedApplication, (0, import_lib4.$E)(TypePredicate), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
   var asserts = $1;
   var t = $3;
   if (!t)
     return $skip;
   if (asserts) {
     t = {
-      type: "AssertsType",
+      type: "TypeAsserts",
       t,
       children: [asserts[0], asserts[1], t],
       ts: true
@@ -17913,8 +18233,8 @@ var TypeUnarySuffix$$ = [TypeUnarySuffix$0, TypeUnarySuffix$1, TypeUnarySuffix$2
 function TypeUnarySuffix(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "TypeUnarySuffix", TypeUnarySuffix$$);
 }
-var TypeUnaryOp$0 = (0, import_lib4.$S)((0, import_lib4.$EXPECT)($L233, 'TypeUnaryOp "keyof"'), NonIdContinue);
-var TypeUnaryOp$1 = (0, import_lib4.$S)((0, import_lib4.$EXPECT)($L194, 'TypeUnaryOp "readonly"'), NonIdContinue);
+var TypeUnaryOp$0 = (0, import_lib4.$S)((0, import_lib4.$EXPECT)($L240, 'TypeUnaryOp "keyof"'), NonIdContinue);
+var TypeUnaryOp$1 = (0, import_lib4.$S)((0, import_lib4.$EXPECT)($L201, 'TypeUnaryOp "readonly"'), NonIdContinue);
 var TypeUnaryOp$$ = [TypeUnaryOp$0, TypeUnaryOp$1];
 function TypeUnaryOp(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "TypeUnaryOp", TypeUnaryOp$$);
@@ -17944,7 +18264,7 @@ var TypeIndexedAccess$$ = [TypeIndexedAccess$0, TypeIndexedAccess$1, TypeIndexed
 function TypeIndexedAccess(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "TypeIndexedAccess", TypeIndexedAccess$$);
 }
-var UnknownAlias$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L234, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
+var UnknownAlias$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L241, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "unknown" };
 });
 function UnknownAlias(ctx, state2) {
@@ -18015,12 +18335,17 @@ var ImportType$$ = [ImportType$0, ImportType$1];
 function ImportType(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "ImportType", ImportType$$);
 }
-var TypeTuple$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(OpenBracket, AllowAll, (0, import_lib4.$E)((0, import_lib4.$S)(TypeTupleContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
-  if (!$3)
+var TypeTuple$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(OpenBracket, AllowAll, (0, import_lib4.$E)(TypeTupleContent), RestoreAll, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var open = $1;
+  var elements = $3;
+  var ws = $5;
+  var close = $6;
+  if (!elements)
     return $skip;
   return {
     type: "TypeTuple",
-    children: [$1, ...$3]
+    elements,
+    children: [open, elements, ws, close]
   };
 });
 function TypeTuple(ctx, state2) {
@@ -18082,19 +18407,28 @@ var TypeElement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(__, (0, import_lib4
       message: "... both before and after identifier"
     }];
   }
-  return [ws, dots, name, colon, type];
+  return {
+    type: "TypeElement",
+    name,
+    t: type,
+    children: [ws, dots, name, colon, type]
+  };
 });
 var TypeElement$1 = (0, import_lib4.$S)(__, DotDotDot, __, Type);
 var TypeElement$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Type, (0, import_lib4.$E)((0, import_lib4.$S)((0, import_lib4.$E)(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
   var type = $1;
   var spaceDots = $2;
-  if (!spaceDots)
-    return type;
-  const [space, dots] = spaceDots;
-  const ws = getTrimmingSpace(type);
-  if (!ws)
-    return [dots, space, type];
-  return [ws, dots, space, trimFirstSpace(type)];
+  if (spaceDots) {
+    const [space, dots] = spaceDots;
+    const ws = getTrimmingSpace(type);
+    spaceDots = [ws, dots, space];
+    type = trimFirstSpace(type);
+  }
+  return {
+    type: "TypeElement",
+    t: type,
+    children: [spaceDots, type]
+  };
 });
 var TypeElement$$ = [TypeElement$0, TypeElement$1, TypeElement$2];
 function TypeElement(ctx, state2) {
@@ -18323,13 +18657,13 @@ var TypeLiteral$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EX
     return num;
   return $0;
 });
-var TypeLiteral$3 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L216, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var TypeLiteral$3 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L223, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { type: "VoidType", $loc, token: $1 };
 });
-var TypeLiteral$4 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L235, 'TypeLiteral "unique"'), _, (0, import_lib4.$EXPECT)($L236, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+var TypeLiteral$4 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L242, 'TypeLiteral "unique"'), _, (0, import_lib4.$EXPECT)($L243, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
   return { type: "UniqueSymbolType", children: $0 };
 });
-var TypeLiteral$5 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L237, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+var TypeLiteral$5 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L244, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "[]" };
 });
 var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4, TypeLiteral$5];
@@ -18348,7 +18682,7 @@ var InlineInterfacePropertyDelimiter$0 = (0, import_lib4.$C)((0, import_lib4.$S)
 var InlineInterfacePropertyDelimiter$1 = (0, import_lib4.$T)((0, import_lib4.$S)((0, import_lib4.$Y)((0, import_lib4.$S)(SameLineOrIndentedFurther, InlineBasicInterfaceProperty)), InsertComma), function(value) {
   return value[1];
 });
-var InlineInterfacePropertyDelimiter$2 = (0, import_lib4.$Y)((0, import_lib4.$S)(__, (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L16, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib4.$EXPECT)($L133, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib4.$EXPECT)($L46, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib4.$EXPECT)($L37, 'InlineInterfacePropertyDelimiter "}"'))));
+var InlineInterfacePropertyDelimiter$2 = (0, import_lib4.$Y)((0, import_lib4.$S)(__, (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L16, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib4.$EXPECT)($L140, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib4.$EXPECT)($L46, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib4.$EXPECT)($L37, 'InlineInterfacePropertyDelimiter "}"'))));
 var InlineInterfacePropertyDelimiter$3 = (0, import_lib4.$Y)(EOS);
 var InlineInterfacePropertyDelimiter$$ = [InlineInterfacePropertyDelimiter$0, InlineInterfacePropertyDelimiter$1, InlineInterfacePropertyDelimiter$2, InlineInterfacePropertyDelimiter$3];
 function InlineInterfacePropertyDelimiter(ctx, state2) {
@@ -18364,31 +18698,54 @@ var TypeBinaryOp$$ = [TypeBinaryOp$0, TypeBinaryOp$1];
 function TypeBinaryOp(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "TypeBinaryOp", TypeBinaryOp$$);
 }
-var TypeFunction$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(Abstract, (0, import_lib4.$E)(_))), (0, import_lib4.$E)((0, import_lib4.$S)(New, (0, import_lib4.$E)(_))), Parameters, __, TypeArrowFunction, (0, import_lib4.$E)(ReturnType)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-  var type = $6;
-  const children = [...$0];
-  if ($1 && !$2) {
+var TypeFunction$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)((0, import_lib4.$S)(Abstract, (0, import_lib4.$E)(_))), (0, import_lib4.$E)((0, import_lib4.$S)(Async, (0, import_lib4.$E)(_))), (0, import_lib4.$E)((0, import_lib4.$S)(New, (0, import_lib4.$E)(_))), Parameters, __, TypeFunctionArrow, (0, import_lib4.$C)(ReturnType, Loc)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var abstract = $1;
+  var async = $2;
+  var new_ = $3;
+  var returnType = $7;
+  const children = [abstract, ...$0.slice(2)];
+  if (abstract && !new_) {
     children[1] = {
       type: "Error",
       message: "abstract function types must be constructors (abstract new)"
     };
   }
-  if (!type)
-    children.push("void");
+  if (returnType.$loc && returnType.token === "") {
+    const t = {
+      type: "VoidType",
+      $loc: returnType.$loc,
+      token: "void"
+    };
+    children[children.length - 1] = returnType = {
+      type: "ReturnTypeAnnotation",
+      ts: true,
+      t,
+      children: [t]
+    };
+  }
+  if (async) {
+    const t = wrapTypeInPromise(returnType.t);
+    children[children.length - 1] = returnType = {
+      ...returnType,
+      t,
+      children: returnType.children.map(($) => $ === returnType.t ? t : $)
+    };
+  }
   return {
     type: "TypeFunction",
     children,
-    ts: true
+    ts: true,
+    returnType
   };
 });
 function TypeFunction(ctx, state2) {
   return (0, import_lib4.$EVENT)(ctx, state2, "TypeFunction", TypeFunction$0);
 }
-var TypeArrowFunction$0 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L13, 'TypeArrowFunction "=>"'), (0, import_lib4.$EXPECT)($L14, 'TypeArrowFunction "\u21D2"'), (0, import_lib4.$EXPECT)($L35, 'TypeArrowFunction "->"'), (0, import_lib4.$EXPECT)($L36, 'TypeArrowFunction "\u2192"')), function($skip, $loc, $0, $1) {
+var TypeFunctionArrow$0 = (0, import_lib4.$TV)((0, import_lib4.$C)((0, import_lib4.$EXPECT)($L13, 'TypeFunctionArrow "=>"'), (0, import_lib4.$EXPECT)($L14, 'TypeFunctionArrow "\u21D2"'), (0, import_lib4.$EXPECT)($L35, 'TypeFunctionArrow "->"'), (0, import_lib4.$EXPECT)($L36, 'TypeFunctionArrow "\u2192"')), function($skip, $loc, $0, $1) {
   return { $loc, token: "=>" };
 });
-function TypeArrowFunction(ctx, state2) {
-  return (0, import_lib4.$EVENT)(ctx, state2, "TypeArrowFunction", TypeArrowFunction$0);
+function TypeFunctionArrow(ctx, state2) {
+  return (0, import_lib4.$EVENT)(ctx, state2, "TypeFunctionArrow", TypeFunctionArrow$0);
 }
 var TypeArguments$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(OpenAngleBracket, (0, import_lib4.$P)((0, import_lib4.$S)(__, TypeArgumentDelimited)), __, CloseAngleBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
   var args = $2;
@@ -18564,7 +18921,7 @@ var CivetPrologue$$ = [CivetPrologue$0, CivetPrologue$1];
 function CivetPrologue(ctx, state2) {
   return (0, import_lib4.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
 }
-var CivetPrologueContent$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L238, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib4.$Q)(CivetOption), (0, import_lib4.$EXPECT)($R95, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+var CivetPrologueContent$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L245, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib4.$Q)(CivetOption), (0, import_lib4.$EXPECT)($R95, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
   var options = $3;
   return {
     type: "CivetPrologue",