@danielx/civet 0.9.2 → 0.9.4

package/dist/main.js

@@ -57,7 +57,7 @@ var require_machine = __commonJS({
       $EVENT: () => $EVENT2,
       $EVENT_C: () => $EVENT_C2,
       $EXPECT: () => $EXPECT2,
-      $L: () => $L247,
+      $L: () => $L249,
       $N: () => $N2,
       $P: () => $P2,
       $Q: () => $Q2,
@@ -82,7 +82,7 @@ var require_machine = __commonJS({
         return result;
       };
     }
-    function $L247(str) {
+    function $L249(str) {
       return function(_ctx, state2) {
         const { input, pos } = state2, { length } = str, end = pos + length;
         if (input.substring(pos, end) === str) {
@@ -513,6 +513,7 @@ __export(lib_civet_exports, {
   append: () => append,
   attachPostfixStatementAsExpression: () => attachPostfixStatementAsExpression,
   blockWithPrefix: () => blockWithPrefix,
+  braceBlock: () => braceBlock,
   convertNamedImportsToObject: () => convertNamedImportsToObject,
   convertObjectToJSXAttributes: () => convertObjectToJSXAttributes,
   convertWithClause: () => convertWithClause,
@@ -993,6 +994,57 @@ function literalValue(literal) {
     }
   }
 }
+function literalType(literal) {
+  let t;
+  switch (literal.type) {
+    case "RegularExpressionLiteral": {
+      t = "RegExp";
+      break;
+    }
+    case "TemplateLiteral": {
+      t = "string";
+      break;
+    }
+    case "Literal": {
+      switch (literal.subtype) {
+        case "NullLiteral": {
+          t = "null";
+          break;
+        }
+        case "BooleanLiteral": {
+          t = "boolean";
+          break;
+        }
+        case "NumericLiteral": {
+          if (literal.raw.endsWith("n")) {
+            t = "bigint";
+          } else {
+            t = "number";
+          }
+          ;
+          break;
+        }
+        case "StringLiteral": {
+          t = "string";
+          break;
+        }
+        default: {
+          throw new Error(`unknown literal subtype ${literal.subtype}`);
+        }
+      }
+      ;
+      break;
+    }
+    default: {
+      throw new Error(`unknown literal type ${literal.type}`);
+    }
+  }
+  return {
+    type: "TypeLiteral",
+    t,
+    children: [t]
+  };
+}
 function makeNumericLiteral(n) {
   const s = n.toString();
   return {
@@ -1305,7 +1357,7 @@ function skipIfOnlyWS(target) {
   return target;
 }
 function spliceChild(node, child, del, ...replacements) {
-  const children = node?.children ?? node;
+  const children = Array.isArray(node) ? node : node.children;
   if (!Array.isArray(children)) {
     throw new Error("spliceChild: non-array node has no children field");
   }
@@ -1740,14 +1792,41 @@ function gatherBindingCode(statements, opts) {
   const thisAssignments = [];
   const splices = [];
   function insertRestSplices(s, p, thisAssignments2) {
-    for (let ref2 = gatherRecursiveAll(s, (n) => n.blockPrefix || opts?.injectParamProps && n.accessModifier || n.type === "AtBinding"), i3 = 0, len22 = ref2.length; i3 < len22; i3++) {
-      const n = ref2[i3];
+    let m;
+    for (let ref2 = gatherRecursiveAll(
+      s,
+      (n) => n.blockPrefix || opts?.injectParamProps && n.accessModifier || n.type === "AtBinding" || opts?.assignPins && (m = n.type, m === "PinPattern" || m === "PinProperty")
+    ), i3 = 0, len22 = ref2.length; i3 < len22; i3++) {
+      let n = ref2[i3];
       if (n.type === "AtBinding") {
         const { ref } = n;
         const { id } = ref;
         thisAssignments2.push([`this.${id} = `, ref]);
         continue;
       }
+      if (opts?.assignPins) {
+        if (n.type === "PinProperty") {
+          n.children = n.children.flatMap(($2) => $2 === n.name ? [n.name, ": ", n.value] : $2);
+          updateParentPointers(n);
+          n = n.value;
+        }
+        if (n.type === "PinPattern") {
+          n.ref = makeRef(
+            n.expression.type === "Identifier" ? n.expression.name : "pin"
+          );
+          n.children = [n.ref];
+          updateParentPointers(n);
+          thisAssignments2.push({
+            type: "AssignmentExpression",
+            children: [n.expression, " = ", n.ref],
+            names: [],
+            lhs: n.expression,
+            assigned: n.expression,
+            expression: n.ref
+          });
+          continue;
+        }
+      }
       if (opts?.injectParamProps && n.type === "Parameter" && n.accessModifier) {
         for (let ref3 = n.names, i4 = 0, len3 = ref3.length; i4 < len3; i4++) {
           const id = ref3[i4];
@@ -1931,16 +2010,18 @@ var declareHelper = {
       "\n"
     ]]);
   },
-  rslice(rsliceRef) {
-    const RSliceable = makeRef("RSliceable");
+  RSliceable(RSliceableRef) {
     state.prelude.push([
       "",
-      ts(["type ", RSliceable, "<R> = string | {length: number; slice(start: number, end: number): {reverse(): R}}\n"])
+      ts(["type ", RSliceableRef, "<R> = string | {length: number; slice(start: number, end: number): {reverse(): R}}\n"])
     ]);
+  },
+  rslice(rsliceRef) {
+    const RSliceableRef = getHelperRef("RSliceable");
     state.prelude.push(["", [
       preludeVar,
       rsliceRef,
-      ts([": <R, T extends string | ", RSliceable, "<R>>(a: T, start?: number, end?: number) => T extends string ? string : T extends ", RSliceable, "<infer R> ? R : never"]),
+      ts([": <R, T extends string | ", RSliceableRef, "<R>>(a: T, start?: number, end?: number) => T extends string ? string : T extends ", RSliceableRef, "<infer R> ? R : never"]),
       " = ((a, start = -1, end = -1) => {\n",
       "  const l = a.length\n",
       "  if (start < 0) start += l\n",
@@ -1959,6 +2040,72 @@ var declareHelper = {
       "})"
     ], ";\n"]);
   },
+  range(rangeRef) {
+    state.prelude.push(["", [
+      preludeVar,
+      rangeRef,
+      ts([": (start: number, end: number) => number[]"]),
+      " ",
+      `= (start, end) => {
+  const length = end - start;
+  if (length <= 0) return [];
+  const arr = Array(length);
+  for (let i = 0; i < length; ++i) {
+    arr[i] = i + start;
+  }
+  return arr;
+}`
+    ], ";\n"]);
+  },
+  revRange(revRangeRef) {
+    state.prelude.push(["", [
+      preludeVar,
+      revRangeRef,
+      ts([": (start: number, end: number) => number[]"]),
+      " ",
+      `= (start, end) => {
+  const length = start - end;
+  if (length <= 0) return [];
+  const arr = Array(length);
+  for (let i = 0; i < length; ++i) {
+    arr[i] = start - i;
+  }
+  return arr;
+}`
+    ], ";\n"]);
+  },
+  stringRange(stringRangeRef) {
+    state.prelude.push(["", [
+      preludeVar,
+      stringRangeRef,
+      ts([": (start: number, length: number) => string[]"]),
+      " ",
+      `= (start, length) => {
+  if (length <= 0) return [];
+  const arr = Array(length);
+  for (let i = 0; i < length; ++i) {
+    arr[i] = String.fromCharCode(start + i);
+  }
+  return arr;
+}`
+    ], ";\n"]);
+  },
+  revStringRange(revStringRangeRef) {
+    state.prelude.push(["", [
+      preludeVar,
+      revStringRangeRef,
+      ts([": (start: number, length: number) => string[]"]),
+      " ",
+      `= (start, length) => {
+  if (length <= 0) return [];
+  const arr = Array(length);
+  for (let i = 0; i < length; ++i) {
+    arr[i] = String.fromCharCode(start - i);
+  }
+  return arr;
+}`
+    ], ";\n"]);
+  },
   div(divRef) {
     state.prelude.push(["", [
       // [indent, statement]
@@ -2101,9 +2248,28 @@ function peekHelperRef(base) {
   return state.helperRefs[base];
 }
 function extractPreludeFor(node) {
-  let helpers = new Set(Object.values(state.helperRefs));
-  helpers = new Set(gatherRecursive(node, helpers.has.bind(helpers)));
-  return state.prelude.filter((s) => gatherRecursive(s, helpers.has.bind(helpers)).length);
+  if (!state.prelude.length) {
+    return state.prelude;
+  }
+  const allHelpers = new Set(Object.values(state.helperRefs));
+  const isHelper = allHelpers.has.bind(allHelpers);
+  const usedHelpers = new Set(gatherRecursive(node, isHelper));
+  while (true) {
+    let prelude = state.prelude.filter((s) => {
+      return gatherRecursive(s, usedHelpers.has.bind(usedHelpers)).length;
+    });
+    let changed = false;
+    for (let ref1 = gatherRecursive(prelude, isHelper), i = 0, len3 = ref1.length; i < len3; i++) {
+      const helper = ref1[i];
+      if (!usedHelpers.has(helper)) {
+        usedHelpers.add(helper);
+        changed = true;
+      }
+    }
+    if (!changed) {
+      return prelude;
+    }
+  }
 }
 
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\generate.civet.jsx
@@ -2115,7 +2281,8 @@ function stringify(node) {
   }
 }
 function gen(root, options) {
-  const updateSourceMap = options?.sourceMap?.updateSourceMap;
+  let ref;
+  const updateSourceMap = (ref = options?.sourceMap)?.updateSourceMap.bind(ref);
   return recurse(root);
   function recurse(node) {
     if (!(node != null)) {
@@ -2140,15 +2307,15 @@ function gen(root, options) {
         let line = "?";
         let column = "?";
         let offset;
-        let ref;
-        if (ref = options.sourceMap) {
-          const sourceMap = ref;
+        let ref1;
+        if (ref1 = options.sourceMap) {
+          const sourceMap = ref1;
           if (node.$loc != null) {
             sourceMap.updateSourceMap("", node.$loc.pos);
           }
-          line = sourceMap.data.srcLine + 1;
-          column = sourceMap.data.srcColumn + 1;
-          offset = sourceMap.data.srcOffset;
+          line = sourceMap.srcLine + 1;
+          column = sourceMap.srcColumn + 1;
+          offset = sourceMap.srcOffset;
         }
         options.errors ??= [];
         options.errors.push(new import_lib2.ParseError(
@@ -3199,9 +3366,30 @@ function wrapIterationReturningResults(statement, collect) {
   if (statement.resultsRef != null) {
     return;
   }
-  const resultsRef = statement.resultsRef = makeRef("results");
+  if (statement.resultsParent) {
+    const { ancestor: ancestor2 } = findAncestor(
+      statement,
+      ($5) => $5.type === "ForStatement" || $5.type === "IterationStatement",
+      isFunction
+    );
+    if (!ancestor2) {
+      statement.children.unshift({
+        type: "Error",
+        message: "Could not find ancestor of spread iteration"
+      });
+      return;
+    }
+    const resultsRef2 = statement.resultsRef = ancestor2.resultsRef;
+    iterationDefaultBody(statement);
+    const { block } = statement;
+    if (!block.empty) {
+      assignResults(block, (node) => [resultsRef2, ".push(", node, ")"]);
+    }
+    return;
+  }
+  const resultsRef = statement.resultsRef ??= makeRef("results");
   const declaration = iterationDeclaration(statement);
-  const { ancestor, child } = findAncestor(statement, ($5) => $5.type === "BlockStatement");
+  const { ancestor, child } = findAncestor(statement, ($6) => $6.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`);
@@ -3245,6 +3433,9 @@ function iterationDeclaration(statement) {
         case "every": {
           return "true";
         }
+        case "first": {
+          return "undefined";
+        }
         case "min": {
           return "Infinity";
         }
@@ -3257,6 +3448,9 @@ function iterationDeclaration(statement) {
         case "join": {
           return '""';
         }
+        case "concat": {
+          return "[]";
+        }
         default: {
           return "0";
         }
@@ -3301,10 +3495,16 @@ function iterationDeclaration(statement) {
           case "count": {
             return ["if (", node, ") ++", resultsRef];
           }
+          case "first": {
+            return [resultsRef, " = ", node, "; break"];
+          }
           case "sum":
           case "join": {
             return [resultsRef, " += ", node];
           }
+          case "concat": {
+            return [getHelperRef("concatAssign"), "(", resultsRef, ", ", node, ")"];
+          }
           case "product": {
             return [resultsRef, " *= ", node];
           }
@@ -3358,31 +3558,34 @@ function iterationDefaultBody(statement) {
       }
     }
   }
-  if (statement.type === "ForStatement" && statement.declaration?.type === "ForDeclaration") {
-    if (reduction) {
-      const bindings = patternBindings(statement.declaration.binding.pattern);
-      if (bindings.length) {
-        fillBlock(["", bindings[0]]);
-        for (const binding of bindings.slice(1)) {
-          binding.children.unshift({
-            type: "Error",
-            subtype: "Warning",
-            message: "Ignored binding in reduction loop with implicit body"
-          });
+  if (statement.type === "ForStatement") {
+    const declaration = statement.eachDeclaration ?? statement.declaration;
+    if (declaration?.type === "ForDeclaration") {
+      if (reduction) {
+        const bindings = patternBindings(declaration.binding.pattern);
+        if (bindings.length) {
+          fillBlock(["", bindings[0]]);
+          for (const binding of bindings.slice(1)) {
+            binding.children.unshift({
+              type: "Error",
+              subtype: "Warning",
+              message: "Ignored binding in reduction loop with implicit body"
+            });
+          }
+        } else {
+          fillBlock([
+            "",
+            {
+              type: "Error",
+              message: "Empty binding pattern in reduction loop with implicit body"
+            }
+          ]);
         }
       } else {
-        fillBlock([
-          "",
-          {
-            type: "Error",
-            message: "Empty binding pattern in reduction loop with implicit body"
-          }
-        ]);
+        fillBlock(["", patternAsValue(declaration.binding.pattern)]);
       }
-    } else {
-      fillBlock(["", patternAsValue(statement.declaration.binding.pattern)]);
+      block.empty = false;
     }
-    block.empty = false;
   }
   return false;
 }
@@ -3443,7 +3646,7 @@ function processParams(f) {
       }
     }
   }
-  parameters.names = before.flatMap(($6) => $6.names);
+  parameters.names = before.flatMap(($7) => $7.names);
   parameters.parameters.splice(0, 1 / 0, ...[]);
   if (tt) {
     parameters.parameters.push(tt);
@@ -3461,7 +3664,7 @@ function processParams(f) {
         });
       }
       after = trimFirstSpace(after);
-      const names = after.flatMap(($7) => $7.names);
+      const names = after.flatMap(($8) => $8.names);
       const elements = after.map((p) => {
         if (p.type === "Error") {
           return p;
@@ -3550,9 +3753,9 @@ function processParams(f) {
           colon,
           t,
           children: [
-            ...oldSuffix.children.filter(($8) => (
+            ...oldSuffix.children.filter(($9) => (
               // spaces and colon
-              $8 !== oldSuffix.optional && $8 !== oldSuffix.t
+              $9 !== oldSuffix.optional && $9 !== oldSuffix.t
             )),
             !oldSuffix.colon ? colon : void 0,
             t
@@ -3583,27 +3786,28 @@ function processParams(f) {
     indent = expressions[0][0];
   }
   const [splices, thisAssignments] = gatherBindingCode(parameters, {
-    injectParamProps: isConstructor
+    injectParamProps: isConstructor,
+    assignPins: true
   });
   if (isConstructor) {
-    const { ancestor } = findAncestor(f, ($9) => $9.type === "ClassExpression");
+    const { ancestor } = findAncestor(f, ($10) => $10.type === "ClassExpression");
     if (ancestor != null) {
-      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($10) => $10.type === "FieldDefinition").map(($11) => $11.id).filter((a3) => typeof a3 === "object" && a3 != null && "type" in a3 && a3.type === "Identifier").map(($12) => $12.name));
+      const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($11) => $11.type === "FieldDefinition").map(($12) => $12.id).filter((a3) => typeof a3 === "object" && a3 != null && "type" in a3 && a3.type === "Identifier").map(($13) => $13.name));
       const classExpressions = ancestor.body.expressions;
-      let index = findChildIndex(classExpressions, f);
-      assert.notEqual(index, -1, "Could not find constructor in class");
+      let index2 = findChildIndex(classExpressions, f);
+      assert.notEqual(index2, -1, "Could not find constructor in class");
       let m4;
-      while (m4 = classExpressions[index - 1]?.[1], typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "MethodDefinition" && "name" in m4 && m4.name === "constructor") {
-        index--;
+      while (m4 = classExpressions[index2 - 1]?.[1], typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "MethodDefinition" && "name" in m4 && m4.name === "constructor") {
+        index2--;
       }
-      const fStatement = classExpressions[index];
-      for (let ref18 = gatherRecursive(parameters, ($13) => $13.type === "Parameter"), i9 = 0, len8 = ref18.length; i9 < len8; i9++) {
+      const fStatement = classExpressions[index2];
+      for (let ref18 = gatherRecursive(parameters, ($14) => $14.type === "Parameter"), i9 = 0, len8 = ref18.length; i9 < len8; i9++) {
         const parameter = ref18[i9];
         const { accessModifier } = parameter;
         if (!(accessModifier || parameter.typeSuffix)) {
           continue;
         }
-        for (let ref19 = gatherRecursive(parameter, ($14) => $14.type === "AtBinding"), i10 = 0, len9 = ref19.length; i10 < len9; i10++) {
+        for (let ref19 = gatherRecursive(parameter, ($15) => $15.type === "AtBinding"), i10 = 0, len9 = ref19.length; i10 < len9; i10++) {
           const binding = ref19[i10];
           const typeSuffix = binding.parent?.typeSuffix;
           if (!(accessModifier || typeSuffix)) {
@@ -3617,7 +3821,7 @@ function processParams(f) {
           if (fields.has(id)) {
             continue;
           }
-          classExpressions.splice(index++, 0, [fStatement[0], {
+          classExpressions.splice(index2++, 0, [fStatement[0], {
             type: "FieldDefinition",
             id,
             typeSuffix,
@@ -3654,25 +3858,31 @@ function processParams(f) {
   if (!prefix.length) {
     return;
   }
+  let index = -1;
   if (isConstructor) {
-    const superCalls = gatherNodes(
-      expressions,
-      (a4) => typeof a4 === "object" && a4 != null && "type" in a4 && a4.type === "CallExpression" && "children" in a4 && Array.isArray(a4.children) && a4.children.length >= 1 && typeof a4.children[0] === "object" && a4.children[0] != null && "token" in a4.children[0] && a4.children[0].token === "super"
-    );
-    if (superCalls.length) {
-      const { child } = findAncestor(superCalls[0], (a5) => a5 === block);
-      const index = findChildIndex(expressions, child);
-      if (index < 0) {
-        throw new Error("Could not find super call within top-level expressions");
-      }
-      expressions.splice(index + 1, 0, ...prefix);
-      return;
-    }
+    index = findSuperCall(block);
   }
-  expressions.unshift(...prefix);
+  expressions.splice(index + 1, 0, ...prefix);
   updateParentPointers(block);
   braceBlock(block);
 }
+function findSuperCall(block) {
+  const { expressions } = block;
+  const superCalls = gatherNodes(
+    expressions,
+    (a4) => typeof a4 === "object" && a4 != null && "type" in a4 && a4.type === "CallExpression" && "children" in a4 && Array.isArray(a4.children) && a4.children.length >= 1 && typeof a4.children[0] === "object" && a4.children[0] != null && "token" in a4.children[0] && a4.children[0].token === "super"
+  );
+  if (superCalls.length) {
+    const { child } = findAncestor(superCalls[0], (a5) => a5 === block);
+    const index = findChildIndex(expressions, child);
+    if (index < 0) {
+      throw new Error("Could not find super call within top-level expressions");
+    }
+    return index;
+  } else {
+    return -1;
+  }
+}
 function processSignature(f) {
   const { block, signature } = f;
   if (!f.async?.length && hasAwait(block)) {
@@ -3680,7 +3890,7 @@ function processSignature(f) {
       f.async.push("async ");
       signature.modifier.async = true;
     } else {
-      for (let ref21 = gatherRecursiveWithinFunction(block, ($15) => $15.type === "Await"), i12 = 0, len11 = ref21.length; i12 < len11; i12++) {
+      for (let ref21 = gatherRecursiveWithinFunction(block, ($16) => $16.type === "Await"), i12 = 0, len11 = ref21.length; i12 < len11; i12++) {
         const a = ref21[i12];
         const i = findChildIndex(a.parent, a);
         a.parent.children.splice(i + 1, 0, {
@@ -3695,9 +3905,9 @@ function processSignature(f) {
       f.generator.push("*");
       signature.modifier.generator = true;
     } else {
-      for (let ref22 = gatherRecursiveWithinFunction(block, ($16) => $16.type === "YieldExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
+      for (let ref22 = gatherRecursiveWithinFunction(block, ($17) => $17.type === "YieldExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
         const y = ref22[i13];
-        const i = y.children.findIndex(($17) => $17.type === "Yield");
+        const i = y.children.findIndex(($18) => $18.type === "Yield");
         y.children.splice(i + 1, 0, {
           type: "Error",
           message: `yield invalid in ${f.type === "ArrowFunction" ? "=> arrow function" : signature.modifier.get ? "getter" : signature.modifier.set ? "setter" : signature.name}`
@@ -3710,7 +3920,7 @@ function processSignature(f) {
   }
 }
 function processFunctions(statements, config2) {
-  for (let ref23 = gatherRecursiveAll(statements, ($18) => $18.type === "FunctionExpression" || $18.type === "ArrowFunction" || $18.type === "MethodDefinition"), i14 = 0, len13 = ref23.length; i14 < len13; i14++) {
+  for (let ref23 = gatherRecursiveAll(statements, ($19) => $19.type === "FunctionExpression" || $19.type === "ArrowFunction" || $19.type === "MethodDefinition"), i14 = 0, len13 = ref23.length; i14 < len13; i14++) {
     const f = ref23[i14];
     if (f.type === "FunctionExpression" || f.type === "MethodDefinition") {
       implicitFunctionBlock(f);
@@ -3722,7 +3932,7 @@ function processFunctions(statements, config2) {
 }
 function expressionizeIteration(exp) {
   let { async, generator, block, children, statement } = exp;
-  const i = children.indexOf(statement);
+  let i = children.indexOf(statement);
   if (i < 0) {
     throw new Error("Could not find iteration statement in iteration expression");
   }
@@ -3733,12 +3943,6 @@ function expressionizeIteration(exp) {
   }
   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 {
@@ -3786,7 +3990,7 @@ function expressionizeIteration(exp) {
   }
 }
 function processIterationExpressions(statements) {
-  for (let ref25 = gatherRecursiveAll(statements, ($19) => $19.type === "IterationExpression"), i15 = 0, len14 = ref25.length; i15 < len14; i15++) {
+  for (let ref25 = gatherRecursiveAll(statements, ($20) => $20.type === "IterationExpression"), i15 = 0, len14 = ref25.length; i15 < len14; i15++) {
     const s = ref25[i15];
     expressionizeIteration(s);
   }
@@ -3836,12 +4040,12 @@ function processCoffeeDo(ws, expression) {
     const newParameters = {
       ...parameters,
       parameters: newParameterList,
-      children: parameters.children.map(($20) => $20 === parameterList ? newParameterList : $20)
+      children: parameters.children.map(($21) => $21 === parameterList ? newParameterList : $21)
     };
     expression = {
       ...expression,
       parameters: newParameters,
-      children: expression.children.map(($21) => $21 === parameters ? newParameters : $21)
+      children: expression.children.map(($22) => $22 === parameters ? newParameters : $22)
     };
   }
   return {
@@ -3863,7 +4067,7 @@ function makeAmpersandFunction(rhs) {
     ref = makeRef("$");
     inplacePrepend(ref, body);
   }
-  if (startsWithPredicate(body, ($22) => $22.type === "ObjectExpression")) {
+  if (startsWithPredicate(body, ($23) => $23.type === "ObjectExpression")) {
     body = makeLeftHandSideExpression(body);
   }
   const parameterList = [
@@ -4723,29 +4927,36 @@ function getPatternBlockPrefix(pattern, ref, decl = "const ", typeSuffix) {
   }
   let [splices, thisAssignments] = gatherBindingCode(pattern);
   const patternBindings2 = nonMatcherBindings(pattern);
+  const results = [];
+  for (let ref2 = gatherRecursiveAll(patternBindings2, ($7) => $7.subbinding != null), i5 = 0, len4 = ref2.length; i5 < len4; i5++) {
+    const p = ref2[i5];
+    results.push(prepend(", ", p.subbinding));
+  }
+  ;
+  const subbindings = results;
   splices = splices.map((s) => [", ", nonMatcherBindings(s)]);
-  thisAssignments = thisAssignments.map(($7) => ["", $7, ";"]);
+  thisAssignments = thisAssignments.map(($8) => ["", $8, ";"]);
   const duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices]);
   return [
     ["", {
       type: "Declaration",
-      children: [decl, patternBindings2, typeSuffix, " = ", ref, ...splices],
+      children: [decl, patternBindings2, typeSuffix, " = ", ref, ...subbindings, ...splices],
       names: [],
       bindings: []
       // avoid implicit return of any bindings
     }, ";"],
     ...thisAssignments,
-    ...duplicateDeclarations.map(($8) => ["", $8, ";"])
+    ...duplicateDeclarations.map(($9) => ["", $9, ";"])
   ];
 }
 function elideMatchersFromArrayBindings(elements) {
-  const results = [];
-  for (let i5 = 0, len4 = elements.length; i5 < len4; i5++) {
-    const element = elements[i5];
+  const results1 = [];
+  for (let i6 = 0, len5 = elements.length; i6 < len5; i6++) {
+    const element = elements[i6];
     switch (element.type) {
       case "BindingRestElement":
       case "ElisionElement": {
-        results.push(element);
+        results1.push(element);
         break;
       }
       case "BindingElement": {
@@ -4754,12 +4965,12 @@ function elideMatchersFromArrayBindings(elements) {
           case "RegularExpressionLiteral":
           case "StringLiteral":
           case "PinPattern": {
-            results.push(element.delim);
+            results1.push(element.delim);
             break;
           }
           default: {
             const binding = nonMatcherBindings(element.binding);
-            results.push(makeNode({
+            results1.push(makeNode({
               ...element,
               binding,
               children: element.children.map((c) => {
@@ -4774,46 +4985,75 @@ function elideMatchersFromArrayBindings(elements) {
     }
   }
   ;
-  return results;
+  return results1;
 }
 function elideMatchersFromPropertyBindings(properties) {
-  return properties.map((p) => {
+  const results2 = [];
+  for (let i7 = 0, len6 = properties.length; i7 < len6; i7++) {
+    const p = properties[i7];
     switch (p.type) {
-      case "BindingProperty": {
-        const { children, name, value } = p;
+      case "BindingProperty":
+      case "PinProperty": {
+        const { children, name, value, bind } = p;
         const [ws] = children;
         const shouldElide = name.type === "NumericLiteral" && !value?.name || name.type === "ComputedPropertyName" && value?.subtype === "NumericLiteral";
         if (shouldElide) {
-          return;
-        }
-        switch (value && value.type) {
-          case "ArrayBindingPattern":
-          case "ObjectBindingPattern": {
-            const bindings = nonMatcherBindings(value);
-            return {
-              ...p,
-              children: [ws, name, bindings && ": ", bindings, p.delim]
-            };
+          if (bind) {
+            results2.push({
+              type: "Error",
+              message: `Cannot bind ${name.type}`
+            });
+          } else {
+            continue;
           }
-          case "Identifier": {
-            return p;
+        } else {
+          let contents;
+          switch (value?.type) {
+            case "ArrayBindingPattern":
+            case "ObjectBindingPattern": {
+              const bindings = nonMatcherBindings(value);
+              contents = {
+                ...p,
+                value: bindings,
+                children: [ws, name, bindings && ": ", bindings, p.delim]
+              };
+              break;
+            }
+            case "Identifier":
+            case void 0: {
+              contents = p;
+              break;
+            }
+            default: {
+              contents = void 0;
+            }
           }
-          case "Literal":
-          case "RegularExpressionLiteral":
-          case "StringLiteral":
-          default:
-            return {
+          if (bind) {
+            results2.push({
               ...p,
-              children: [ws, name, p.delim]
-            };
+              children: [ws, name, p.delim],
+              subbinding: contents?.value ? [
+                contents.value,
+                " = ",
+                name
+              ] : void 0
+            });
+          } else if (contents) {
+            results2.push(contents);
+          } else {
+            continue;
+          }
         }
+        ;
+        break;
+      }
+      default: {
+        results2.push(p);
       }
-      case "PinProperty":
-      case "BindingRestProperty":
-      default:
-        return p;
     }
-  });
+  }
+  ;
+  return results2;
 }
 function nonMatcherBindings(pattern) {
   switch (pattern.type) {
@@ -4823,7 +5063,7 @@ function nonMatcherBindings(pattern) {
       return makeNode({
         ...pattern,
         elements,
-        children: pattern.children.map(($9) => $9 === pattern.elements ? elements : $9)
+        children: pattern.children.map(($10) => $10 === pattern.elements ? elements : $10)
       });
     }
     case "ObjectBindingPattern": {
@@ -4831,7 +5071,7 @@ function nonMatcherBindings(pattern) {
       return makeNode({
         ...pattern,
         properties,
-        children: pattern.children.map(($10) => $10 === pattern.properties ? properties : $10)
+        children: pattern.children.map(($11) => $11 === pattern.properties ? properties : $11)
       });
     }
     default: {
@@ -4849,8 +5089,8 @@ function aggregateDuplicateBindings(bindings) {
   );
   const declarations = [];
   const propsGroupedByName = /* @__PURE__ */ new Map();
-  for (let i6 = 0, len5 = props.length; i6 < len5; i6++) {
-    const p = props[i6];
+  for (let i8 = 0, len7 = props.length; i8 < len7; i8++) {
+    const p = props[i8];
     const { name, value } = p;
     let m1;
     if (m1 = value?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern") {
@@ -4875,8 +5115,8 @@ function aggregateDuplicateBindings(bindings) {
       pos: 0,
       input: key
     })) {
-      for (let i7 = 0, len6 = shared.length; i7 < len6; i7++) {
-        const p = shared[i7];
+      for (let i9 = 0, len8 = shared.length; i9 < len8; i9++) {
+        const p = shared[i9];
         aliasBinding(p, makeRef(`_${key}`, key));
       }
       return;
@@ -4965,18 +5205,47 @@ function processDeclarations(statements) {
   for (let ref1 = gatherRecursiveAll(statements, ($) => $.type === "Declaration"), i1 = 0, len1 = ref1.length; i1 < len1; i1++) {
     const declaration = ref1[i1];
     const { bindings } = declaration;
-    bindings?.forEach((binding) => {
-      const { typeSuffix } = binding;
-      if (typeSuffix && typeSuffix.optional && typeSuffix.t) {
-        convertOptionalType(typeSuffix);
+    if (!(bindings != null)) {
+      continue;
+    }
+    for (let i2 = 0, len22 = bindings.length; i2 < len22; i2++) {
+      const binding = bindings[i2];
+      let { typeSuffix, initializer } = binding;
+      if (typeSuffix && typeSuffix.optional) {
+        if (initializer && !typeSuffix.t) {
+          const expression = trimFirstSpace(initializer.expression);
+          let m;
+          if (m = expression.type, m === "Identifier" || m === "MemberExpression") {
+            typeSuffix.children.push(": ", typeSuffix.t = {
+              type: "TypeTypeof",
+              children: ["typeof ", expression],
+              expression
+            });
+          } else if (expression.type === "Literal" || expression.type === "RegularExpressionLiteral" || expression.type === "TemplateLiteral") {
+            typeSuffix.children.push(": ", typeSuffix.t = literalType(expression));
+          } else {
+            spliceChild(binding, typeSuffix, 1, {
+              type: "Error",
+              message: `Optional type can only be inferred from literals or member expressions, not ${expression.type}`
+            });
+            continue;
+          }
+        }
+        if (typeSuffix.t) {
+          convertOptionalType(typeSuffix);
+        } else {
+          spliceChild(binding, typeSuffix, 1);
+          binding.children.push(initializer = binding.initializer = {
+            type: "Initializer",
+            expression: "undefined",
+            children: [" = ", "undefined"]
+          });
+        }
       }
-      const { initializer } = binding;
       if (initializer) {
-        return prependStatementExpressionBlock(initializer, declaration);
+        prependStatementExpressionBlock(initializer, declaration);
       }
-      ;
-      return;
-    });
+    }
   }
 }
 function prependStatementExpressionBlock(initializer, statement) {
@@ -4986,7 +5255,7 @@ function prependStatementExpressionBlock(initializer, statement) {
     ws = exp[0];
     exp = exp[1];
   }
-  if (!(exp?.type === "StatementExpression")) {
+  if (!(typeof exp === "object" && exp != null && "type" in exp && exp.type === "StatementExpression" || typeof exp === "object" && exp != null && "type" in exp && exp.type === "SpreadElement" && "expression" in exp && typeof exp.expression === "object" && exp.expression != null && "type" in exp.expression && exp.expression.type === "StatementExpression")) {
     return;
   }
   const pre = [];
@@ -5139,16 +5408,16 @@ function processDeclarationConditionStatement(s) {
     if (conditions.length) {
       let children = condition.children;
       if (s.negated) {
-        let m;
-        if (!(m = condition.expression, typeof m === "object" && m != null && "type" in m && m.type === "UnaryExpression" && "children" in m && Array.isArray(m.children) && len2(m.children, 2) && Array.isArray(m.children[0]) && len2(m.children[0], 1) && m.children[0][0] === "!" && typeof m.children[1] === "object" && m.children[1] != null && "type" in m.children[1] && m.children[1].type === "ParenthesizedExpression")) {
+        let m1;
+        if (!(m1 = condition.expression, typeof m1 === "object" && m1 != null && "type" in m1 && m1.type === "UnaryExpression" && "children" in m1 && Array.isArray(m1.children) && len2(m1.children, 2) && Array.isArray(m1.children[0]) && len2(m1.children[0], 1) && m1.children[0][0] === "!" && typeof m1.children[1] === "object" && m1.children[1] != null && "type" in m1.children[1] && m1.children[1].type === "ParenthesizedExpression")) {
           throw new Error("Unsupported negated condition");
         }
         ;
         ({ children } = condition.expression.children[1]);
       }
       children.unshift("(");
-      for (let i2 = 0, len22 = conditions.length; i2 < len22; i2++) {
-        const c = conditions[i2];
+      for (let i3 = 0, len3 = conditions.length; i3 < len3; i3++) {
+        const c = conditions[i3];
         children.push(" && ", c);
       }
       children.push(")");
@@ -5269,7 +5538,8 @@ function dynamizeFromClause(from) {
   if (ref3 = from[from.length - 1]?.assertion) {
     const assert2 = ref3;
     let ref4;
-    ref4 = from[from.length - 1], ref4.children = ref4.children.filter((a2) => a2 !== assert2);
+    ref4 = from[from.length - 1];
+    ref4.children = ref4.children.filter((a2) => a2 !== assert2);
     from.push(", {", assert2.keyword, ":", assert2.object, "}");
   }
   return ["(", ...from, ")"];
@@ -5823,14 +6093,6 @@ function processRangeExpression(start, ws1, range, end) {
   ;
   const abs = ref;
   const lengthAdjust = 1 - Number(!range.left.inclusive) - Number(!range.right.inclusive);
-  let ref1;
-  if (lengthAdjust > 0) ref1 = ` + ${lengthAdjust}`;
-  else if (lengthAdjust < 0) ref1 = ` - ${-lengthAdjust}`;
-  else {
-    ref1 = void 0;
-  }
-  ;
-  const lengthAdjustExpression = ref1;
   let children;
   if (typeof start === "object" && start != null && "type" in start && start.type === "Literal" && (typeof end === "object" && end != null && "type" in end && end.type === "Literal")) {
     let startValue = literalValue(start);
@@ -5856,11 +6118,12 @@ function processRangeExpression(start, ws1, range, end) {
         ];
       } else {
         children = [
-          `Array.from({length: ${length.toString()}}, `,
-          "(_, i) => String.fromCharCode(",
+          getHelperRef(startCode <= endCode ? "stringRange" : "revStringRange"),
+          "(",
           startCode.toString(),
-          step > 0 ? " + " : " - ",
-          "i))"
+          ", ",
+          length.toString(),
+          ")"
         ];
       }
       if (range.error != null) {
@@ -5889,22 +6152,25 @@ function processRangeExpression(start, ws1, range, end) {
       const sign = range.increasing ? "+" : "-";
       end = makeLeftHandSideExpression(end);
       children = [
-        "((s) => Array.from({length: ",
-        range.increasing ? [ws2, end, " - s"] : ["s - ", ws2, end],
-        lengthAdjustExpression,
-        "}, (_, i) => s ",
-        sign,
-        " i))",
+        getHelperRef(range.increasing ? "range" : "revRange"),
         "(",
         range.left.inclusive ? start : [makeLeftHandSideExpression(start), ` ${sign} 1`],
+        ",",
+        range.right.inclusive ? [makeLeftHandSideExpression(end), ` ${sign} 1`] : end,
         ...ws1,
         ")"
       ];
     } else {
       children = [
-        "((s, e) => {let step = e > s ? 1 : -1; return Array.from({length: Math.abs(e - s)",
-        lengthAdjustExpression,
-        "}, (_, i) => s + i * step)})",
+        "((s, e) => s > e ? ",
+        getHelperRef("revRange"),
+        "(s, e",
+        range.right.inclusive ? " - 1" : void 0,
+        ") : ",
+        getHelperRef("range"),
+        "(s, e",
+        range.right.inclusive ? " + 1" : void 0,
+        "))",
         "(",
         start,
         ...ws1,
@@ -5945,25 +6211,25 @@ function forRange(open, forDeclaration, range, stepExp, close) {
       asc = false;
     }
   }
-  let ref2;
+  let ref1;
   if (stepExp?.type === "Literal") {
     try {
-      ref2 = literalValue(stepExp);
+      ref1 = literalValue(stepExp);
     } catch (e) {
-      ref2 = void 0;
+      ref1 = void 0;
     }
   } else {
-    ref2 = void 0;
+    ref1 = void 0;
   }
   ;
-  const stepValue = ref2;
+  const stepValue = ref1;
   if (typeof stepValue === "number") {
     asc = stepValue > 0;
   }
-  let ref3;
-  if (stepRef) ref3 = start;
-  else ref3 = maybeRef(start, "start");
-  let startRef = ref3;
+  let ref2;
+  if (stepRef) ref2 = start;
+  else ref2 = maybeRef(start, "start");
+  let startRef = ref2;
   let endRef = maybeRef(end, "end");
   const startRefDec = startRef !== start ? [startRef, " = ", start, ", "] : [];
   const endRefDec = endRef !== end ? [endRef, " = ", end, ", "] : [];
@@ -5975,8 +6241,8 @@ function forRange(open, forDeclaration, range, stepExp, close) {
   }
   if (start?.type === "Literal" && "Literal" === end?.type) {
     asc = literalValue(start) <= literalValue(end);
-    let ref4;
-    if ("StringLiteral" === (ref4 = start.subtype) && ref4 === end.subtype) {
+    let ref3;
+    if ("StringLiteral" === (ref3 = start.subtype) && ref3 === end.subtype) {
       const startChar = literalValue(start).charCodeAt(0).toString();
       startRef = {
         type: "Literal",
@@ -6032,8 +6298,8 @@ function forRange(open, forDeclaration, range, stepExp, close) {
 }
 function processForInOf($0) {
   let [awaits, eachOwn, open, declaration, declaration2, ws, inOf, exp, step, close] = $0;
-  for (let ref5 = [declaration, declaration2?.[declaration2.length - 1]], i1 = 0, len3 = ref5.length; i1 < len3; i1++) {
-    const decl = ref5[i1];
+  for (let ref4 = [declaration, declaration2?.[declaration2.length - 1]], i1 = 0, len3 = ref4.length; i1 < len3; i1++) {
+    const decl = ref4[i1];
     if (!(decl != null)) {
       continue;
     }
@@ -6082,6 +6348,7 @@ function processForInOf($0) {
         names: assignmentNames,
         implicitLift: true
       }, ";"]);
+      const eachDeclaration = declaration;
       declaration = {
         type: "Declaration",
         children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", trimFirstSpace(expRef2), ".length"],
@@ -6089,7 +6356,7 @@ function processForInOf($0) {
       };
       const condition = [counterRef, " < ", lenRef, "; "];
       const children = [open, declaration, "; ", condition, counterRef, increment, close];
-      return { declaration, children, blockPrefix };
+      return { declaration, eachDeclaration, children, blockPrefix };
     } else {
       eachOwnError = {
         type: "Error",
@@ -6303,12 +6570,10 @@ function createVarDecs(block, scopes, pushVar) {
     }
     return assignmentStatements2;
   }
-  if (!pushVar) {
-    pushVar = function(name) {
-      varIds.push(name);
-      return decs.add(name);
-    };
-  }
+  pushVar ??= (name) => {
+    varIds.push(name);
+    return decs.add(name);
+  };
   const { expressions: statements } = block;
   const decs = findDecs(statements);
   scopes.push(decs);
@@ -7407,7 +7672,7 @@ function processAssignments(statements) {
     let { lhs: $1, expression: $2 } = exp, tail = [], len3 = $1.length;
     let block;
     let ref12;
-    if (exp.parent?.type === "BlockStatement" && !(ref12 = $1[$1.length - 1])?.[ref12.length - 1]?.special) {
+    if (blockContainingStatement(exp) && !(ref12 = $1[$1.length - 1])?.[ref12.length - 1]?.special) {
       block = makeBlockFragment();
       let ref13;
       if (ref13 = prependStatementExpressionBlock(
@@ -7908,6 +8173,91 @@ function processBreaksContinues(statements) {
     delete label.special;
   }
 }
+function processCoffeeClasses(statements) {
+  for (let ref21 = gatherRecursiveAll(statements, ($13) => $13.type === "ClassExpression"), i11 = 0, len9 = ref21.length; i11 < len9; i11++) {
+    const ce = ref21[i11];
+    const { expressions } = ce.body;
+    const indent = expressions[0]?.[0] ?? "\n";
+    const autoBinds = expressions.filter(($14) => $14[1]?.autoBind);
+    if (autoBinds.length) {
+      let construct;
+      for (const [, c] of expressions) {
+        if (typeof c === "object" && c != null && "type" in c && c.type === "MethodDefinition" && "name" in c && c.name === "constructor" && c.block) {
+          construct = c;
+          break;
+        }
+      }
+      if (!construct) {
+        const parametersList = [];
+        const parameters = {
+          type: "Parameters",
+          children: [parametersList],
+          parameters: parametersList,
+          names: []
+        };
+        const signature = {
+          type: "MethodSignature",
+          children: ["constructor(", parameters, ")"],
+          parameters,
+          modifier: {},
+          returnType: void 0
+        };
+        const block = makeEmptyBlock();
+        construct = {
+          ...signature,
+          type: "MethodDefinition",
+          name: "constructor",
+          block,
+          signature,
+          children: [...signature.children, block]
+        };
+        expressions.unshift([indent, construct]);
+      }
+      const index = findSuperCall(construct.block);
+      construct.block.expressions.splice(
+        index + 1,
+        0,
+        ...(() => {
+          const results3 = [];
+          for (let i12 = 0, len10 = autoBinds.length; i12 < len10; i12++) {
+            const [, a] = autoBinds[i12];
+            results3.push([indent, ["this.", a.name, " = this.", a.name, ".bind(this)"], ";"]);
+          }
+          return results3;
+        })()
+      );
+    }
+    const privates = expressions.filter(($15) => $15[1]?.type === "CoffeeClassPrivate");
+    if (!privates.length) {
+      continue;
+    }
+    const { parent } = ce;
+    for (let i13 = expressions.length + -1; i13 >= 0; --i13) {
+      const i = i13;
+      if (expressions[i][1]?.type === "CoffeeClassPrivate") {
+        expressions.splice(i, 1);
+      }
+    }
+    let wrapped = wrapIIFE([
+      ...privates,
+      [indent, wrapWithReturn(ce)]
+    ]);
+    if (ce && typeof ce === "object" && "binding" in ce) {
+      let { binding } = ce;
+      binding = trimFirstSpace(binding);
+      wrapped = makeNode({
+        type: "AssignmentExpression",
+        children: [binding, " = ", wrapped],
+        lhs: binding,
+        // TODO: incorrect shape
+        assigned: binding,
+        expression: wrapped,
+        names: [ce.name]
+      });
+    }
+    replaceNode(ce, wrapped, parent);
+  }
+}
 function processProgram(root) {
   const state2 = getState();
   const config2 = getConfig();
@@ -7918,15 +8268,8 @@ function processProgram(root) {
   assert.equal(state2.forbidNewlineBinaryOp.length, 1, "forbidNewlineBinaryOp");
   assert.equal(state2.forbidTrailingMemberProperty.length, 1, "forbidTrailingMemberProperty");
   assert.equal(state2.JSXTagStack.length, 1, "JSXTagStack");
-  let rootIIFE;
-  if (config2.iife || config2.repl) {
-    rootIIFE = wrapIIFE(root.expressions, root.topLevelAwait);
-    const newExpressions = [["", rootIIFE]];
-    root.children = root.children.map(($13) => $13 === root.expressions ? newExpressions : $13);
-    root.expressions = newExpressions;
-  }
   addParentPointers(root);
-  const { expressions: statements } = root;
+  let { expressions: statements } = root;
   processPlaceholders(statements);
   processNegativeIndexAccess(statements);
   processTypes(statements);
@@ -7939,9 +8282,25 @@ function processProgram(root) {
   processIterationExpressions(statements);
   processFinallyClauses(statements);
   processBreaksContinues(statements);
+  root.topLevelAwait = hasAwait(statements);
+  root.topLevelYield = hasYield(statements);
+  let rootIIFE;
+  if (config2.iife || config2.repl) {
+    rootIIFE = wrapIIFE(
+      root.expressions,
+      root.topLevelAwait,
+      root.topLevelYield ? "*" : void 0
+    );
+    statements = [["", rootIIFE]];
+    root.children = root.children.map(($16) => $16 === root.expressions ? statements : $16);
+    root.expressions = statements;
+  }
   hoistRefDecs(statements);
   processFunctions(statements, config2);
-  statements.unshift(...state2.prelude);
+  if (config2.coffeeClasses) {
+    processCoffeeClasses(statements);
+  }
+  statements.unshift(...extractPreludeFor(statements));
   if (config2.autoLet) {
     createConstLetDecs(statements, [], "let");
   } else if (config2.autoConst) {
@@ -7964,10 +8323,10 @@ async function processProgramAsync(root) {
   await processComptime(statements);
 }
 function processRepl(root, rootIIFE) {
-  const topBlock = gatherRecursive(rootIIFE, ($14) => $14.type === "BlockStatement")[0];
+  const topBlock = gatherRecursive(rootIIFE, ($17) => $17.type === "BlockStatement")[0];
   let i = 0;
-  for (let ref21 = gatherRecursiveWithinFunction(topBlock, ($15) => $15.type === "Declaration"), i11 = 0, len9 = ref21.length; i11 < len9; i11++) {
-    const decl = ref21[i11];
+  for (let ref22 = gatherRecursiveWithinFunction(topBlock, ($18) => $18.type === "Declaration"), i14 = 0, len11 = ref22.length; i14 < len11; i14++) {
+    const decl = ref22[i14];
     if (!decl.names?.length) {
       continue;
     }
@@ -7980,8 +8339,8 @@ function processRepl(root, rootIIFE) {
       root.expressions.splice(i++, 0, ["", `var ${decl.names.join(",")}`, ";"]);
     }
   }
-  for (let ref22 = gatherRecursive(topBlock, ($16) => $16.type === "FunctionExpression"), i12 = 0, len10 = ref22.length; i12 < len10; i12++) {
-    const func = ref22[i12];
+  for (let ref23 = gatherRecursive(topBlock, ($19) => $19.type === "FunctionExpression"), i15 = 0, len12 = ref23.length; i15 < len12; i15++) {
+    const func = ref23[i15];
     if (func.name && func.parent?.type === "BlockStatement") {
       if (func.parent === topBlock) {
         replaceNode(func, void 0);
@@ -7993,8 +8352,8 @@ function processRepl(root, rootIIFE) {
       }
     }
   }
-  for (let ref23 = gatherRecursiveWithinFunction(topBlock, ($17) => $17.type === "ClassExpression"), i13 = 0, len11 = ref23.length; i13 < len11; i13++) {
-    const classExp = ref23[i13];
+  for (let ref24 = gatherRecursiveWithinFunction(topBlock, ($20) => $20.type === "ClassExpression"), i16 = 0, len13 = ref24.length; i16 < len13; i16++) {
+    const classExp = ref24[i16];
     let m8;
     if (classExp.name && classExp.parent === topBlock || (m8 = classExp.parent, typeof m8 === "object" && m8 != null && "type" in m8 && m8.type === "ReturnStatement" && "parent" in m8 && m8.parent === topBlock)) {
       classExp.children.unshift(classExp.name, "=");
@@ -8003,7 +8362,7 @@ function processRepl(root, rootIIFE) {
   }
 }
 function populateRefs(statements) {
-  const refNodes = gatherRecursive(statements, ($18) => $18.type === "Ref");
+  const refNodes = gatherRecursive(statements, ($21) => $21.type === "Ref");
   if (refNodes.length) {
     const ids = gatherRecursive(statements, (s) => s.type === "Identifier");
     const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
@@ -8025,8 +8384,8 @@ function populateRefs(statements) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  for (let ref24 = gatherRecursiveAll(statements, ($19) => $19.type === "Placeholder"), i14 = 0, len12 = ref24.length; i14 < len12; i14++) {
-    const exp = ref24[i14];
+  for (let ref25 = gatherRecursiveAll(statements, ($22) => $22.type === "Placeholder"), i17 = 0, len14 = ref25.length; i17 < len14; i17++) {
+    const exp = ref25[i17];
     let ancestor;
     if (exp.subtype === ".") {
       ({ ancestor } = findAncestor(
@@ -8135,11 +8494,11 @@ function processPlaceholders(statements) {
   for (const [ancestor, placeholders] of placeholderMap) {
     let ref = makeRef("$");
     let typeSuffix;
-    for (let i15 = 0, len13 = placeholders.length; i15 < len13; i15++) {
-      const placeholder = placeholders[i15];
+    for (let i18 = 0, len15 = placeholders.length; i18 < len15; i18++) {
+      const placeholder = placeholders[i18];
       typeSuffix ??= placeholder.typeSuffix;
-      let ref25;
-      (ref25 = placeholder.children)[ref25.length - 1] = ref;
+      let ref26;
+      (ref26 = placeholder.children)[ref26.length - 1] = ref;
     }
     const { parent } = ancestor;
     const body = maybeUnwrap(ancestor);
@@ -8160,16 +8519,16 @@ function processPlaceholders(statements) {
       }
       case "PipelineExpression": {
         const i = findChildIndex(parent, ancestor);
-        let ref26;
+        let ref27;
         if (i === 1) {
-          ref26 = ancestor === parent.children[i];
+          ref27 = ancestor === parent.children[i];
         } else if (i === 2) {
-          ref26 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
+          ref27 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
         } else {
-          ref26 = void 0;
+          ref27 = void 0;
         }
         ;
-        outer = ref26;
+        outer = ref27;
         break;
       }
       case "AssignmentExpression":
@@ -8184,9 +8543,9 @@ function processPlaceholders(statements) {
       fnExp = makeLeftHandSideExpression(fnExp);
     }
     replaceNode(ancestor, fnExp, parent);
-    let ref27;
-    if (ref27 = getTrimmingSpace(body)) {
-      const ws = ref27;
+    let ref28;
+    if (ref28 = getTrimmingSpace(body)) {
+      const ws = ref28;
       inplaceInsertTrimmingSpace(body, "");
       inplacePrepend(ws, fnExp);
     }
@@ -8230,8 +8589,8 @@ function reorderBindingRestProperty(props) {
       }
     ];
   }
-  let ref28;
-  if (Array.isArray(rest.delim) && (ref28 = rest.delim)[ref28.length - 1]?.token === ",") {
+  let ref29;
+  if (Array.isArray(rest.delim) && (ref29 = rest.delim)[ref29.length - 1]?.token === ",") {
     rest.delim = rest.delim.slice(0, -1);
     rest.children = [...rest.children.slice(0, -1), rest.delim];
   }
@@ -8322,6 +8681,8 @@ var grammar = {
   ExpressionizedStatement,
   StatementExpression,
   CommaExpression,
+  CommaExpressionSpread,
+  AssignmentExpressionSpread,
   Arguments,
   ImplicitArguments,
   ExplicitArguments,
@@ -8501,6 +8862,7 @@ var grammar = {
   BareNestedBlock,
   BareBlock,
   ThenClause,
+  ThenBlock,
   BracedThenClause,
   BracedOrEmptyBlock,
   NoCommaBracedOrEmptyBlock,
@@ -8610,6 +8972,7 @@ var grammar = {
   PostfixStatement,
   _PostfixStatement,
   Statement,
+  IterationActualStatement,
   ShouldExpressionize,
   NoCommaStatement,
   EmptyStatement,
@@ -9265,130 +9628,132 @@ var $L119 = (0, import_lib2.$L)(";");
 var $L120 = (0, import_lib2.$L)("some");
 var $L121 = (0, import_lib2.$L)("every");
 var $L122 = (0, import_lib2.$L)("count");
-var $L123 = (0, import_lib2.$L)("sum");
-var $L124 = (0, import_lib2.$L)("product");
-var $L125 = (0, import_lib2.$L)("min");
-var $L126 = (0, import_lib2.$L)("max");
-var $L127 = (0, import_lib2.$L)("join");
-var $L128 = (0, import_lib2.$L)("break");
-var $L129 = (0, import_lib2.$L)("continue");
-var $L130 = (0, import_lib2.$L)("debugger");
-var $L131 = (0, import_lib2.$L)("require");
-var $L132 = (0, import_lib2.$L)("with");
-var $L133 = (0, import_lib2.$L)("assert");
-var $L134 = (0, import_lib2.$L)(":=");
-var $L135 = (0, import_lib2.$L)("\u2254");
-var $L136 = (0, import_lib2.$L)(".=");
-var $L137 = (0, import_lib2.$L)("::=");
-var $L138 = (0, import_lib2.$L)("/*");
-var $L139 = (0, import_lib2.$L)("*/");
-var $L140 = (0, import_lib2.$L)("\\");
-var $L141 = (0, import_lib2.$L)(")");
-var $L142 = (0, import_lib2.$L)("abstract");
-var $L143 = (0, import_lib2.$L)("as");
-var $L144 = (0, import_lib2.$L)("@");
-var $L145 = (0, import_lib2.$L)("@@");
-var $L146 = (0, import_lib2.$L)("async");
-var $L147 = (0, import_lib2.$L)("await");
-var $L148 = (0, import_lib2.$L)("`");
-var $L149 = (0, import_lib2.$L)("by");
-var $L150 = (0, import_lib2.$L)("case");
-var $L151 = (0, import_lib2.$L)("catch");
-var $L152 = (0, import_lib2.$L)("class");
-var $L153 = (0, import_lib2.$L)("#{");
-var $L154 = (0, import_lib2.$L)("comptime");
-var $L155 = (0, import_lib2.$L)("declare");
-var $L156 = (0, import_lib2.$L)("default");
-var $L157 = (0, import_lib2.$L)("delete");
-var $L158 = (0, import_lib2.$L)("do");
-var $L159 = (0, import_lib2.$L)("..");
-var $L160 = (0, import_lib2.$L)("\u2025");
-var $L161 = (0, import_lib2.$L)("...");
-var $L162 = (0, import_lib2.$L)("\u2026");
-var $L163 = (0, import_lib2.$L)("::");
-var $L164 = (0, import_lib2.$L)('"');
-var $L165 = (0, import_lib2.$L)("each");
-var $L166 = (0, import_lib2.$L)("else");
-var $L167 = (0, import_lib2.$L)("!");
-var $L168 = (0, import_lib2.$L)("export");
-var $L169 = (0, import_lib2.$L)("extends");
-var $L170 = (0, import_lib2.$L)("finally");
-var $L171 = (0, import_lib2.$L)("for");
-var $L172 = (0, import_lib2.$L)("from");
-var $L173 = (0, import_lib2.$L)("function");
-var $L174 = (0, import_lib2.$L)("get");
-var $L175 = (0, import_lib2.$L)("set");
-var $L176 = (0, import_lib2.$L)("#");
-var $L177 = (0, import_lib2.$L)("if");
-var $L178 = (0, import_lib2.$L)("in");
-var $L179 = (0, import_lib2.$L)("infer");
-var $L180 = (0, import_lib2.$L)("let");
-var $L181 = (0, import_lib2.$L)("const");
-var $L182 = (0, import_lib2.$L)("is");
-var $L183 = (0, import_lib2.$L)("var");
-var $L184 = (0, import_lib2.$L)("like");
-var $L185 = (0, import_lib2.$L)("loop");
-var $L186 = (0, import_lib2.$L)("new");
-var $L187 = (0, import_lib2.$L)("not");
-var $L188 = (0, import_lib2.$L)("of");
-var $L189 = (0, import_lib2.$L)("[");
-var $L190 = (0, import_lib2.$L)("operator");
-var $L191 = (0, import_lib2.$L)("override");
-var $L192 = (0, import_lib2.$L)("own");
-var $L193 = (0, import_lib2.$L)("public");
-var $L194 = (0, import_lib2.$L)("private");
-var $L195 = (0, import_lib2.$L)("protected");
-var $L196 = (0, import_lib2.$L)("||>");
-var $L197 = (0, import_lib2.$L)("|\u25B7");
-var $L198 = (0, import_lib2.$L)("|>=");
-var $L199 = (0, import_lib2.$L)("\u25B7=");
-var $L200 = (0, import_lib2.$L)("|>");
-var $L201 = (0, import_lib2.$L)("\u25B7");
-var $L202 = (0, import_lib2.$L)("readonly");
-var $L203 = (0, import_lib2.$L)("return");
-var $L204 = (0, import_lib2.$L)("satisfies");
-var $L205 = (0, import_lib2.$L)("'");
-var $L206 = (0, import_lib2.$L)("static");
-var $L207 = (0, import_lib2.$L)("${");
-var $L208 = (0, import_lib2.$L)("super");
-var $L209 = (0, import_lib2.$L)("switch");
-var $L210 = (0, import_lib2.$L)("target");
-var $L211 = (0, import_lib2.$L)("then");
-var $L212 = (0, import_lib2.$L)("this");
-var $L213 = (0, import_lib2.$L)("throw");
-var $L214 = (0, import_lib2.$L)('"""');
-var $L215 = (0, import_lib2.$L)("'''");
-var $L216 = (0, import_lib2.$L)("///");
-var $L217 = (0, import_lib2.$L)("```");
-var $L218 = (0, import_lib2.$L)("try");
-var $L219 = (0, import_lib2.$L)("typeof");
-var $L220 = (0, import_lib2.$L)("undefined");
-var $L221 = (0, import_lib2.$L)("unless");
-var $L222 = (0, import_lib2.$L)("until");
-var $L223 = (0, import_lib2.$L)("using");
-var $L224 = (0, import_lib2.$L)("void");
-var $L225 = (0, import_lib2.$L)("when");
-var $L226 = (0, import_lib2.$L)("while");
-var $L227 = (0, import_lib2.$L)("yield");
-var $L228 = (0, import_lib2.$L)("/>");
-var $L229 = (0, import_lib2.$L)("</");
-var $L230 = (0, import_lib2.$L)("<>");
-var $L231 = (0, import_lib2.$L)("</>");
-var $L232 = (0, import_lib2.$L)("<!--");
-var $L233 = (0, import_lib2.$L)("-->");
-var $L234 = (0, import_lib2.$L)("type");
-var $L235 = (0, import_lib2.$L)("enum");
-var $L236 = (0, import_lib2.$L)("interface");
-var $L237 = (0, import_lib2.$L)("global");
-var $L238 = (0, import_lib2.$L)("module");
-var $L239 = (0, import_lib2.$L)("namespace");
-var $L240 = (0, import_lib2.$L)("asserts");
-var $L241 = (0, import_lib2.$L)("keyof");
-var $L242 = (0, import_lib2.$L)("???");
-var $L243 = (0, import_lib2.$L)("unique");
-var $L244 = (0, import_lib2.$L)("symbol");
-var $L245 = (0, import_lib2.$L)("[]");
-var $L246 = (0, import_lib2.$L)("civet");
+var $L123 = (0, import_lib2.$L)("first");
+var $L124 = (0, import_lib2.$L)("sum");
+var $L125 = (0, import_lib2.$L)("product");
+var $L126 = (0, import_lib2.$L)("min");
+var $L127 = (0, import_lib2.$L)("max");
+var $L128 = (0, import_lib2.$L)("join");
+var $L129 = (0, import_lib2.$L)("concat");
+var $L130 = (0, import_lib2.$L)("break");
+var $L131 = (0, import_lib2.$L)("continue");
+var $L132 = (0, import_lib2.$L)("debugger");
+var $L133 = (0, import_lib2.$L)("require");
+var $L134 = (0, import_lib2.$L)("with");
+var $L135 = (0, import_lib2.$L)("assert");
+var $L136 = (0, import_lib2.$L)(":=");
+var $L137 = (0, import_lib2.$L)("\u2254");
+var $L138 = (0, import_lib2.$L)(".=");
+var $L139 = (0, import_lib2.$L)("::=");
+var $L140 = (0, import_lib2.$L)("/*");
+var $L141 = (0, import_lib2.$L)("*/");
+var $L142 = (0, import_lib2.$L)("\\");
+var $L143 = (0, import_lib2.$L)(")");
+var $L144 = (0, import_lib2.$L)("abstract");
+var $L145 = (0, import_lib2.$L)("as");
+var $L146 = (0, import_lib2.$L)("@");
+var $L147 = (0, import_lib2.$L)("@@");
+var $L148 = (0, import_lib2.$L)("async");
+var $L149 = (0, import_lib2.$L)("await");
+var $L150 = (0, import_lib2.$L)("`");
+var $L151 = (0, import_lib2.$L)("by");
+var $L152 = (0, import_lib2.$L)("case");
+var $L153 = (0, import_lib2.$L)("catch");
+var $L154 = (0, import_lib2.$L)("class");
+var $L155 = (0, import_lib2.$L)("#{");
+var $L156 = (0, import_lib2.$L)("comptime");
+var $L157 = (0, import_lib2.$L)("declare");
+var $L158 = (0, import_lib2.$L)("default");
+var $L159 = (0, import_lib2.$L)("delete");
+var $L160 = (0, import_lib2.$L)("do");
+var $L161 = (0, import_lib2.$L)("..");
+var $L162 = (0, import_lib2.$L)("\u2025");
+var $L163 = (0, import_lib2.$L)("...");
+var $L164 = (0, import_lib2.$L)("\u2026");
+var $L165 = (0, import_lib2.$L)("::");
+var $L166 = (0, import_lib2.$L)('"');
+var $L167 = (0, import_lib2.$L)("each");
+var $L168 = (0, import_lib2.$L)("else");
+var $L169 = (0, import_lib2.$L)("!");
+var $L170 = (0, import_lib2.$L)("export");
+var $L171 = (0, import_lib2.$L)("extends");
+var $L172 = (0, import_lib2.$L)("finally");
+var $L173 = (0, import_lib2.$L)("for");
+var $L174 = (0, import_lib2.$L)("from");
+var $L175 = (0, import_lib2.$L)("function");
+var $L176 = (0, import_lib2.$L)("get");
+var $L177 = (0, import_lib2.$L)("set");
+var $L178 = (0, import_lib2.$L)("#");
+var $L179 = (0, import_lib2.$L)("if");
+var $L180 = (0, import_lib2.$L)("in");
+var $L181 = (0, import_lib2.$L)("infer");
+var $L182 = (0, import_lib2.$L)("let");
+var $L183 = (0, import_lib2.$L)("const");
+var $L184 = (0, import_lib2.$L)("is");
+var $L185 = (0, import_lib2.$L)("var");
+var $L186 = (0, import_lib2.$L)("like");
+var $L187 = (0, import_lib2.$L)("loop");
+var $L188 = (0, import_lib2.$L)("new");
+var $L189 = (0, import_lib2.$L)("not");
+var $L190 = (0, import_lib2.$L)("of");
+var $L191 = (0, import_lib2.$L)("[");
+var $L192 = (0, import_lib2.$L)("operator");
+var $L193 = (0, import_lib2.$L)("override");
+var $L194 = (0, import_lib2.$L)("own");
+var $L195 = (0, import_lib2.$L)("public");
+var $L196 = (0, import_lib2.$L)("private");
+var $L197 = (0, import_lib2.$L)("protected");
+var $L198 = (0, import_lib2.$L)("||>");
+var $L199 = (0, import_lib2.$L)("|\u25B7");
+var $L200 = (0, import_lib2.$L)("|>=");
+var $L201 = (0, import_lib2.$L)("\u25B7=");
+var $L202 = (0, import_lib2.$L)("|>");
+var $L203 = (0, import_lib2.$L)("\u25B7");
+var $L204 = (0, import_lib2.$L)("readonly");
+var $L205 = (0, import_lib2.$L)("return");
+var $L206 = (0, import_lib2.$L)("satisfies");
+var $L207 = (0, import_lib2.$L)("'");
+var $L208 = (0, import_lib2.$L)("static");
+var $L209 = (0, import_lib2.$L)("${");
+var $L210 = (0, import_lib2.$L)("super");
+var $L211 = (0, import_lib2.$L)("switch");
+var $L212 = (0, import_lib2.$L)("target");
+var $L213 = (0, import_lib2.$L)("then");
+var $L214 = (0, import_lib2.$L)("this");
+var $L215 = (0, import_lib2.$L)("throw");
+var $L216 = (0, import_lib2.$L)('"""');
+var $L217 = (0, import_lib2.$L)("'''");
+var $L218 = (0, import_lib2.$L)("///");
+var $L219 = (0, import_lib2.$L)("```");
+var $L220 = (0, import_lib2.$L)("try");
+var $L221 = (0, import_lib2.$L)("typeof");
+var $L222 = (0, import_lib2.$L)("undefined");
+var $L223 = (0, import_lib2.$L)("unless");
+var $L224 = (0, import_lib2.$L)("until");
+var $L225 = (0, import_lib2.$L)("using");
+var $L226 = (0, import_lib2.$L)("void");
+var $L227 = (0, import_lib2.$L)("when");
+var $L228 = (0, import_lib2.$L)("while");
+var $L229 = (0, import_lib2.$L)("yield");
+var $L230 = (0, import_lib2.$L)("/>");
+var $L231 = (0, import_lib2.$L)("</");
+var $L232 = (0, import_lib2.$L)("<>");
+var $L233 = (0, import_lib2.$L)("</>");
+var $L234 = (0, import_lib2.$L)("<!--");
+var $L235 = (0, import_lib2.$L)("-->");
+var $L236 = (0, import_lib2.$L)("type");
+var $L237 = (0, import_lib2.$L)("enum");
+var $L238 = (0, import_lib2.$L)("interface");
+var $L239 = (0, import_lib2.$L)("global");
+var $L240 = (0, import_lib2.$L)("module");
+var $L241 = (0, import_lib2.$L)("namespace");
+var $L242 = (0, import_lib2.$L)("asserts");
+var $L243 = (0, import_lib2.$L)("keyof");
+var $L244 = (0, import_lib2.$L)("???");
+var $L245 = (0, import_lib2.$L)("unique");
+var $L246 = (0, import_lib2.$L)("symbol");
+var $L247 = (0, import_lib2.$L)("[]");
+var $L248 = (0, import_lib2.$L)("civet");
 var $R0 = (0, import_lib2.$R)(new RegExp("(?=async|debugger|if|unless|comptime|do|for|loop|until|while|switch|throw|try)", "suy"));
 var $R1 = (0, import_lib2.$R)(new RegExp("&(?=\\s)", "suy"));
 var $R2 = (0, import_lib2.$R)(new RegExp("(as|of|by|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
@@ -9504,8 +9869,7 @@ var Program$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Reset, Init, (0, import
     expressions: statements,
     children: [reset, init, ws1, statements, ws2],
     bare: true,
-    root: true,
-    topLevelAwait: hasAwait(statements)
+    root: true
   };
   processProgram(program);
   return program;
@@ -9632,6 +9996,71 @@ var CommaExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(AssignmentExpre
 function CommaExpression(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CommaExpression", CommaExpression$0);
 }
+var CommaExpressionSpread$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, (0, import_lib2.$E)(_), IterationActualStatement), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ws = $1;
+  var ws2 = $3;
+  var iteration = $4;
+  if (iteration.subtype === "do" || iteration.subtype === "comptime") return $skip;
+  if (ws2) {
+    if (ws) {
+      ws = [ws, ws2];
+    } else {
+      ws = ws2;
+    }
+  }
+  iteration = { ...iteration, resultsParent: true };
+  return prepend(ws, iteration);
+});
+var CommaExpressionSpread$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AssignmentExpressionSpread, (0, import_lib2.$Q)((0, import_lib2.$S)(CommaDelimiter, AssignmentExpressionSpread))), function($skip, $loc, $0, $1, $2) {
+  if ($2.length == 0) return $1;
+  return $0;
+});
+var CommaExpressionSpread$$ = [CommaExpressionSpread$0, CommaExpressionSpread$1];
+function CommaExpressionSpread(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "CommaExpressionSpread", CommaExpressionSpread$$);
+}
+var AssignmentExpressionSpread$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3) {
+  var expression = $3;
+  return {
+    type: "SpreadElement",
+    children: $0,
+    expression,
+    names: expression.names
+  };
+});
+var AssignmentExpressionSpread$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AssignmentExpression, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
+  var expression = $1;
+  if (!$2) return $1;
+  return {
+    type: "SpreadElement",
+    children: [...$2, $1],
+    expression,
+    names: expression.names
+  };
+});
+var AssignmentExpressionSpread$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3) {
+  var expression = $3;
+  return {
+    type: "SpreadElement",
+    children: $0,
+    expression,
+    names: expression.names
+  };
+});
+var AssignmentExpressionSpread$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(AssignmentExpression, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
+  var expression = $1;
+  if (!$2) return $1;
+  return {
+    type: "SpreadElement",
+    children: [...$2, $1],
+    expression,
+    names: expression.names
+  };
+});
+var AssignmentExpressionSpread$$ = [AssignmentExpressionSpread$0, AssignmentExpressionSpread$1, AssignmentExpressionSpread$2, AssignmentExpressionSpread$3];
+function AssignmentExpressionSpread(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "AssignmentExpressionSpread", AssignmentExpressionSpread$$);
+}
 var Arguments$0 = ExplicitArguments;
 var Arguments$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(ForbidTrailingMemberProperty, (0, import_lib2.$E)(ImplicitArguments), RestoreTrailingMemberProperty), function($skip, $loc, $0, $1, $2, $3) {
   var args = $2;
@@ -10762,8 +11191,7 @@ var FieldDefinition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeClassesEn
   var id = $2;
   var exp = $6;
   switch (exp.type) {
-    // TODO: => functions
-    case "FunctionExpression":
+    case "FunctionExpression": {
       const fnTokenIndex = exp.children.findIndex((c) => c?.token?.startsWith("function"));
       const children = exp.children.slice();
       if (exp.generator) {
@@ -10773,8 +11201,29 @@ var FieldDefinition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeClassesEn
       }
       return {
         ...exp,
+        type: "MethodDefinition",
+        name: id.name,
+        signature: { ...exp.signature, id, name: id.name },
         children
       };
+    }
+    case "ArrowFunction": {
+      const block = { ...exp.block };
+      const children = exp.children.filter((c) => !(Array.isArray(c) && c[c.length - 1]?.token?.includes("=>"))).map((c) => c === exp.block ? block : c);
+      children.unshift(id);
+      exp = {
+        ...exp,
+        type: "MethodDefinition",
+        name: id.name,
+        signature: { ...exp.signature, id, name: id.name },
+        block,
+        children,
+        autoBind: true
+      };
+      block.parent = exp;
+      braceBlock(block);
+      return exp;
+    }
     default:
       return {
         type: "FieldDefinition",
@@ -10784,11 +11233,11 @@ var FieldDefinition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeClassesEn
   }
 });
 var FieldDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertReadonly, ClassElementName, (0, import_lib2.$E)(TypeSuffix), __, ConstAssignment, MaybeNestedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-  var r = $1;
+  var readonly = $1;
   var id = $2;
   var typeSuffix = $3;
   var ca = $5;
-  r.children[0].$loc = {
+  readonly.children[0].$loc = {
     pos: ca.$loc.pos - 1,
     length: ca.$loc.length + 1
   };
@@ -10796,21 +11245,36 @@ var FieldDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertReadonly,
     type: "FieldDefinition",
     id,
     typeSuffix,
-    children: $0
+    children: $0,
+    readonly
+  };
+});
+var FieldDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeClassesEnabled, ActualAssignment), function($skip, $loc, $0, $1, $2) {
+  var assignment = $2;
+  return {
+    type: "CoffeeClassPrivate",
+    children: [assignment],
+    assignment
   };
 });
-var FieldDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(Abstract, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Readonly, (0, import_lib2.$E)(_))), ClassElementName, (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var FieldDefinition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(Abstract, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Readonly, (0, import_lib2.$E)(_))), ClassElementName, (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var abstract = $1;
+  var readonly = $2;
   var id = $3;
   var typeSuffix = $4;
+  var initializer = $5;
   return {
     type: "FieldDefinition",
     children: $0,
-    ts: $1 ? true : void 0,
+    ts: abstract ? true : void 0,
     id,
-    typeSuffix
+    typeSuffix,
+    abstract,
+    readonly,
+    initializer
   };
 });
-var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2];
+var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2, FieldDefinition$3];
 function FieldDefinition(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "FieldDefinition", FieldDefinition$$);
 }
@@ -11617,7 +12081,7 @@ var PinPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExp
   var expression = $2;
   return {
     type: "PinPattern",
-    children: $0,
+    children: [expression],
     expression
   };
 });
@@ -11778,29 +12242,71 @@ function NestedBindingPropertyList(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedBindingPropertyList", NestedBindingPropertyList$0);
 }
 var BindingProperty$0 = BindingRestProperty;
-var BindingProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), PropertyName, (0, import_lib2.$E)(_), Colon, (0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingIdentifier, BindingPattern), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+var BindingProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), PropertyName, (0, import_lib2.$E)(Caret), (0, import_lib2.$E)(_), Colon, (0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingIdentifier, BindingPattern), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var ws1 = $1;
   var name = $2;
-  var value = $6;
-  var typeSuffix = $7;
-  var initializer = $8;
+  var bind = $3;
+  var ws2 = $4;
+  var colon = $5;
+  var ws3 = $6;
+  var value = $7;
+  var typeSuffix = $8;
+  var initializer = $9;
   return {
     type: "BindingProperty",
-    children: [$1, name, $3, $4, $5, value, initializer],
+    children: [ws1, name, ws2, colon, ws3, value, initializer],
     // omit typeSuffix
     name,
     value,
     typeSuffix,
     initializer,
-    names: value.names
+    names: value.names,
+    bind: !!bind
   };
 });
-var BindingProperty$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$E)(Caret), BindingIdentifier, (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var BindingProperty$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Caret, BindingIdentifier, (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var ws = $1;
   var pin = $2;
   var binding = $3;
   var typeSuffix = $4;
   var initializer = $5;
-  let children = [ws, binding, initializer];
+  const children = [ws, binding];
+  if (binding.type === "AtBinding") {
+    children.push({
+      type: "Error",
+      message: "Pinned properties do not yet work with @binding"
+    });
+  }
+  if (typeSuffix) {
+    children.push({
+      type: "Error",
+      message: "Pinned properties cannot have type annotations"
+    });
+  }
+  if (initializer) {
+    children.push({
+      type: "Error",
+      message: "Pinned properties cannot have initializers"
+    });
+  }
+  return {
+    type: "PinProperty",
+    children,
+    name: binding,
+    value: {
+      type: "PinPattern",
+      children: [binding],
+      expression: binding
+    }
+  };
+});
+var BindingProperty$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), BindingIdentifier, (0, import_lib2.$E)(Caret), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var ws = $1;
+  var binding = $2;
+  var bind = $3;
+  var typeSuffix = $4;
+  var initializer = $5;
+  const children = [ws, binding, initializer];
   if (binding.type === "AtBinding") {
     return {
       type: "AtBindingProperty",
@@ -11812,30 +12318,6 @@ var BindingProperty$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
       names: []
     };
   }
-  if (pin) {
-    children = [ws, binding];
-    if (typeSuffix) {
-      children.push({
-        type: "Error",
-        message: "Pinned properties cannot have type annotations"
-      });
-    }
-    if (initializer) {
-      children.push({
-        type: "Error",
-        message: "Pinned properties cannot have initializers"
-      });
-    }
-    return {
-      type: "PinProperty",
-      children,
-      name: binding,
-      value: {
-        type: "PinPattern",
-        expression: binding
-      }
-    };
-  }
   return {
     type: "BindingProperty",
     children,
@@ -11844,10 +12326,11 @@ var BindingProperty$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
     typeSuffix,
     initializer,
     names: binding.names,
-    identifier: binding
+    identifier: binding,
+    bind: !!bind
   };
 });
-var BindingProperty$$ = [BindingProperty$0, BindingProperty$1, BindingProperty$2];
+var BindingProperty$$ = [BindingProperty$0, BindingProperty$1, BindingProperty$2, BindingProperty$3];
 function BindingProperty(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "BindingProperty", BindingProperty$$);
 }
@@ -12413,12 +12896,21 @@ var BareBlock$$ = [BareBlock$0, BareBlock$1, BareBlock$2, BareBlock$3, BareBlock
 function BareBlock(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "BareBlock", BareBlock$$);
 }
-var ThenClause$0 = (0, import_lib2.$T)((0, import_lib2.$S)(Then, SingleLineStatements), function(value) {
+var ThenClause$0 = (0, import_lib2.$T)((0, import_lib2.$S)(Then, ThenBlock), function(value) {
   return value[1];
 });
 function ThenClause(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ThenClause", ThenClause$0);
 }
+var ThenBlock$0 = (0, import_lib2.$T)((0, import_lib2.$S)(NoBlock, EmptyBlock), function(value) {
+  return value[1];
+});
+var ThenBlock$1 = ImplicitNestedBlock;
+var ThenBlock$2 = SingleLineStatements;
+var ThenBlock$$ = [ThenBlock$0, ThenBlock$1, ThenBlock$2];
+function ThenBlock(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "ThenBlock", ThenBlock$$);
+}
 var BracedThenClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Y)(Then), InsertOpenBrace, ThenClause, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
   var open = $2;
   var exp = $3;
@@ -12700,7 +13192,7 @@ function LiteralContent(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "LiteralContent", LiteralContent$$);
 }
 var NullLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L38, 'NullLiteral "null"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-  return { $loc, token: $1 };
+  return { type: "NullLiteral", $loc, token: $1 };
 });
 function NullLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NullLiteral", NullLiteral$0);
@@ -12715,17 +13207,17 @@ var _BooleanLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(CoffeeBooleansEn
   return value[1];
 });
 var _BooleanLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L39, '_BooleanLiteral "true"'), (0, import_lib2.$EXPECT)($L40, '_BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-  return { $loc, token: $1 };
+  return { type: "BooleanLiteral", $loc, token: $1 };
 });
 var _BooleanLiteral$$ = [_BooleanLiteral$0, _BooleanLiteral$1];
 function _BooleanLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "_BooleanLiteral", _BooleanLiteral$$);
 }
 var CoffeeScriptBooleanLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L41, 'CoffeeScriptBooleanLiteral "yes"'), (0, import_lib2.$EXPECT)($L42, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-  return { $loc, token: "true" };
+  return { type: "BooleanLiteral", $loc, token: "true" };
 });
 var CoffeeScriptBooleanLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L43, 'CoffeeScriptBooleanLiteral "no"'), (0, import_lib2.$EXPECT)($L44, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-  return { $loc, token: "false" };
+  return { type: "BooleanLiteral", $loc, token: "false" };
 });
 var CoffeeScriptBooleanLiteral$$ = [CoffeeScriptBooleanLiteral$0, CoffeeScriptBooleanLiteral$1];
 function CoffeeScriptBooleanLiteral(ctx, state2) {
@@ -14430,11 +14922,7 @@ var Statement$1 = VariableStatement;
 var Statement$2 = (0, import_lib2.$T)((0, import_lib2.$S)(IfStatement, (0, import_lib2.$N)(ShouldExpressionize)), function(value) {
   return value[0];
 });
-var Statement$3 = (0, import_lib2.$TS)((0, import_lib2.$S)(IterationStatement, (0, import_lib2.$N)(ShouldExpressionize)), function($skip, $loc, $0, $1, $2) {
-  if ($1.generator) return $skip;
-  if ($1.reduction) return $skip;
-  return $1;
-});
+var Statement$3 = IterationActualStatement;
 var Statement$4 = (0, import_lib2.$T)((0, import_lib2.$S)(SwitchStatement, (0, import_lib2.$N)(ShouldExpressionize)), function(value) {
   return value[0];
 });
@@ -14450,6 +14938,14 @@ var Statement$$ = [Statement$0, Statement$1, Statement$2, Statement$3, Statement
 function Statement(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "Statement", Statement$$);
 }
+var IterationActualStatement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(IterationStatement, (0, import_lib2.$N)(ShouldExpressionize)), function($skip, $loc, $0, $1, $2) {
+  if ($1.generator) return $skip;
+  if ($1.reduction) return $skip;
+  return $1;
+});
+function IterationActualStatement(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "IterationActualStatement", IterationActualStatement$0);
+}
 var ShouldExpressionize$0 = AllowedTrailingCallExpressions;
 var ShouldExpressionize$1 = (0, import_lib2.$S)(NotDedented, Pipe);
 var ShouldExpressionize$2 = BinaryOpRHS;
@@ -14552,12 +15048,12 @@ var LabelledItem$$ = [LabelledItem$0, LabelledItem$1];
 function LabelledItem(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "LabelledItem", LabelledItem$$);
 }
-var IfStatement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)(If, Unless), (0, import_lib2.$E)(_), BoundedCondition, Then, BlockOrEmpty, (0, import_lib2.$E)(ElseClause)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var IfStatement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)(If, Unless), (0, import_lib2.$E)(_), BoundedCondition, ThenClause, (0, import_lib2.$E)(ElseClause)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var kind = $1;
   var ws = $2;
   var condition = $3;
-  var block = $5;
-  var e = $6;
+  var block = $4;
+  var e = $5;
   if (kind.negated) {
     kind = { ...kind, token: "if" };
     condition = negateCondition(condition);
@@ -14801,15 +15297,18 @@ function ForStatement(ctx, state2) {
 var ForClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(For, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$E)(_), Star)), __, ForStatementControlWithWhen), function($skip, $loc, $0, $1, $2, $3, $4) {
   var generator = $2;
   var c = $4;
-  const { children, declaration } = c;
+  let { children, reduction } = c;
+  if (generator && reduction) {
+    children = [{
+      type: "Error",
+      message: `Cannot use reduction (${reduction.subtype}) with generators`
+    }, ...children];
+  }
   return {
+    ...c,
     type: "ForStatement",
     children: [$1, ...$3, ...children],
-    declaration,
     block: null,
-    blockPrefix: c.blockPrefix,
-    hoistDec: c.hoistDec,
-    reduction: c.reduction,
     generator
   };
 });
@@ -14855,7 +15354,7 @@ var ForStatementControlWithReduction$$ = [ForStatementControlWithReduction$0, Fo
 function ForStatementControlWithReduction(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ForStatementControlWithReduction", ForStatementControlWithReduction$$);
 }
-var ForReduction$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L120, 'ForReduction "some"'), (0, import_lib2.$EXPECT)($L121, 'ForReduction "every"'), (0, import_lib2.$EXPECT)($L122, 'ForReduction "count"'), (0, import_lib2.$EXPECT)($L123, 'ForReduction "sum"'), (0, import_lib2.$EXPECT)($L124, 'ForReduction "product"'), (0, import_lib2.$EXPECT)($L125, 'ForReduction "min"'), (0, import_lib2.$EXPECT)($L126, 'ForReduction "max"'), (0, import_lib2.$EXPECT)($L127, 'ForReduction "join"')), NonIdContinue, __), function($skip, $loc, $0, $1, $2, $3) {
+var ForReduction$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L120, 'ForReduction "some"'), (0, import_lib2.$EXPECT)($L121, 'ForReduction "every"'), (0, import_lib2.$EXPECT)($L122, 'ForReduction "count"'), (0, import_lib2.$EXPECT)($L123, 'ForReduction "first"'), (0, import_lib2.$EXPECT)($L124, 'ForReduction "sum"'), (0, import_lib2.$EXPECT)($L125, 'ForReduction "product"'), (0, import_lib2.$EXPECT)($L126, 'ForReduction "min"'), (0, import_lib2.$EXPECT)($L127, 'ForReduction "max"'), (0, import_lib2.$EXPECT)($L128, 'ForReduction "join"'), (0, import_lib2.$EXPECT)($L129, 'ForReduction "concat"')), NonIdContinue, __), function($skip, $loc, $0, $1, $2, $3) {
   var subtype = $1;
   var ws = $3;
   return {
@@ -15704,7 +16203,7 @@ var RestoreAll$0 = (0, import_lib2.$S)(RestoreTrailingMemberProperty, RestoreBra
 function RestoreAll(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "RestoreAll", RestoreAll$0);
 }
-var CommaExpressionStatement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CommaExpression), function($skip, $loc, $0, $1) {
+var CommaExpressionStatement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CommaExpressionSpread), function($skip, $loc, $0, $1) {
   return makeExpressionStatement($1);
 });
 function CommaExpressionStatement(ctx, state2) {
@@ -15778,19 +16277,19 @@ var ThrowStatement$0 = (0, import_lib2.$T)((0, import_lib2.$S)(Throw, MaybeParen
 function ThrowStatement(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ThrowStatement", ThrowStatement$0);
 }
-var Break$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L128, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Break$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L130, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Break(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Break", Break$0);
 }
-var Continue$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L129, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Continue$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L131, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Continue(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Continue", Continue$0);
 }
-var Debugger$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L130, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Debugger$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L132, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Debugger(ctx, state2) {
@@ -15867,7 +16366,7 @@ var MaybeParenNestedExpression$$ = [MaybeParenNestedExpression$0, MaybeParenNest
 function MaybeParenNestedExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MaybeParenNestedExpression", MaybeParenNestedExpression$$);
 }
-var ImportDeclaration$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Import, _, Identifier, (0, import_lib2.$E)(_), Equals, __, (0, import_lib2.$EXPECT)($L131, 'ImportDeclaration "require"'), NonIdContinue, Arguments), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+var ImportDeclaration$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Import, _, Identifier, (0, import_lib2.$E)(_), Equals, __, (0, import_lib2.$EXPECT)($L133, '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 }
@@ -16055,7 +16554,7 @@ var ImpliedFrom$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'ImpliedF
 function ImpliedFrom(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
 }
-var ImportAssertion$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L132, 'ImportAssertion "with"'), (0, import_lib2.$EXPECT)($L133, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib2.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var ImportAssertion$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L134, 'ImportAssertion "with"'), (0, import_lib2.$EXPECT)($L135, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib2.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var keyword = $2;
   var object = $5;
   return {
@@ -16376,19 +16875,19 @@ var LexicalDeclaration$$ = [LexicalDeclaration$0, LexicalDeclaration$1];
 function LexicalDeclaration(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "LexicalDeclaration", LexicalDeclaration$$);
 }
-var ConstAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L134, 'ConstAssignment ":="'), (0, import_lib2.$EXPECT)($L135, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
+var ConstAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L136, 'ConstAssignment ":="'), (0, import_lib2.$EXPECT)($L137, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
   return { $loc, token: "=", decl: "const " };
 });
 function ConstAssignment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ConstAssignment", ConstAssignment$0);
 }
-var LetAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L136, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+var LetAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L138, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
   return { $loc, token: "=", decl: "let " };
 });
 function LetAssignment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "LetAssignment", LetAssignment$0);
 }
-var TypeAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L137, 'TypeAssignment "::="'), function($skip, $loc, $0, $1) {
+var TypeAssignment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L139, 'TypeAssignment "::="'), function($skip, $loc, $0, $1) {
   return { $loc, token: "=" };
 });
 function TypeAssignment(ctx, state2) {
@@ -16611,7 +17110,12 @@ function CoffeeDoubleQuotedStringCharacters(ctx, state2) {
 }
 var RegularExpressionLiteral$0 = HeregexLiteral;
 var RegularExpressionLiteral$1 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L77, 'RegularExpressionLiteral "/"'), RegularExpressionBody, (0, import_lib2.$EXPECT)($L77, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
-  return { type: "RegularExpressionLiteral", $loc, token: $1 };
+  var raw = $0;
+  return {
+    type: "RegularExpressionLiteral",
+    raw,
+    children: [{ $loc, token: raw }]
+  };
 });
 var RegularExpressionLiteral$$ = [RegularExpressionLiteral$0, RegularExpressionLiteral$1];
 function RegularExpressionLiteral(ctx, state2) {
@@ -16827,7 +17331,7 @@ var MultiLineComment$$ = [MultiLineComment$0, MultiLineComment$1];
 function MultiLineComment(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "MultiLineComment", MultiLineComment$$);
 }
-var JSMultiLineComment$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'JSMultiLineComment "/*"'), (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"')), (0, import_lib2.$EXPECT)($R70, "JSMultiLineComment /./"))), (0, import_lib2.$EXPECT)($L139, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+var JSMultiLineComment$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L140, 'JSMultiLineComment "/*"'), (0, import_lib2.$Q)((0, import_lib2.$S)((0, import_lib2.$N)((0, import_lib2.$EXPECT)($L141, 'JSMultiLineComment "*/"')), (0, import_lib2.$EXPECT)($R70, "JSMultiLineComment /./"))), (0, import_lib2.$EXPECT)($L141, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
   return { type: "Comment", $loc, token: $1 };
 });
 function JSMultiLineComment(ctx, state2) {
@@ -16873,7 +17377,7 @@ function _(ctx, state2) {
 var NonNewlineWhitespace$0 = (0, import_lib2.$TR)((0, import_lib2.$EXPECT)($R23, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
   return { $loc, token: $0 };
 });
-var NonNewlineWhitespace$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L140, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
+var NonNewlineWhitespace$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L142, 'NonNewlineWhitespace "\\\\\\\\"'), CoffeeLineContinuationEnabled, EOL), function(value) {
   return " ";
 });
 var NonNewlineWhitespace$$ = [NonNewlineWhitespace$0, NonNewlineWhitespace$1];
@@ -16924,7 +17428,7 @@ var StatementDelimiter$$ = [StatementDelimiter$0, StatementDelimiter$1, Statemen
 function StatementDelimiter(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "StatementDelimiter", StatementDelimiter$$);
 }
-var ClosingDelimiter$0 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L37, 'ClosingDelimiter "}"'), (0, import_lib2.$EXPECT)($L141, 'ClosingDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'ClosingDelimiter "]"'))));
+var ClosingDelimiter$0 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L37, 'ClosingDelimiter "}"'), (0, import_lib2.$EXPECT)($L143, 'ClosingDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'ClosingDelimiter "]"'))));
 function ClosingDelimiter(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ClosingDelimiter", ClosingDelimiter$0);
 }
@@ -16947,7 +17451,7 @@ var Loc$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'Loc ""'), functi
 function Loc(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Loc", Loc$0);
 }
-var Abstract$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L142, 'Abstract "abstract"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+var Abstract$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L144, 'Abstract "abstract"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'Abstract " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1, ts: true };
 });
 function Abstract(ctx, state2) {
@@ -16959,43 +17463,43 @@ var Ampersand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L117, 'Ampersan
 function Ampersand(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Ampersand", Ampersand$0);
 }
-var As$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L143, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var As$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L145, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function As(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "As", As$0);
 }
-var At$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L144, 'At "@"'), function($skip, $loc, $0, $1) {
+var At$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L146, 'At "@"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function At(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "At", At$0);
 }
-var AtAt$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L145, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+var AtAt$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L147, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "@" };
 });
 function AtAt(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "AtAt", AtAt$0);
 }
-var Async$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L146, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Async$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L148, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Async" };
 });
 function Async(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Async", Async$0);
 }
-var Await$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L147, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Await$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L149, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Await" };
 });
 function Await(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Await", Await$0);
 }
-var Backtick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L148, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+var Backtick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L150, 'Backtick "`"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Backtick(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Backtick", Backtick$0);
 }
-var By$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L149, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var By$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L151, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function By(ctx, state2) {
@@ -17007,19 +17511,19 @@ var Caret$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'),
 function Caret(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Caret", Caret$0);
 }
-var Case$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L150, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Case$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L152, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Case(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Case", Case$0);
 }
-var Catch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L151, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Catch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L153, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Catch(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Catch", Catch$0);
 }
-var Class$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L152, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Class$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L154, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Class(ctx, state2) {
@@ -17043,13 +17547,13 @@ var CloseBracket$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L46, 'CloseB
 function CloseBracket(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CloseBracket", CloseBracket$0);
 }
-var CloseParen$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L141, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+var CloseParen$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L143, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function CloseParen(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "CloseParen", CloseParen$0);
 }
-var CoffeeSubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L153, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+var CoffeeSubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L155, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "${" };
 });
 function CoffeeSubstitutionStart(ctx, state2) {
@@ -17067,37 +17571,37 @@ var Comma$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L17, 'Comma ","'),
 function Comma(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Comma", Comma$0);
 }
-var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L154, 'Comptime "comptime"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L16, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
+var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L156, 'Comptime "comptime"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L16, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: $1 };
 });
 function Comptime(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Comptime", Comptime$0);
 }
-var ConstructorShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L144, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+var ConstructorShorthand$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L146, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "constructor" };
 });
 function ConstructorShorthand(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ConstructorShorthand", ConstructorShorthand$0);
 }
-var Declare$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L155, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Declare$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L157, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Declare(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Declare", Declare$0);
 }
-var Default$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L156, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Default$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L158, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Default(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Default", Default$0);
 }
-var Delete$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L157, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Delete$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L159, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Delete(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Delete", Delete$0);
 }
-var Do$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L158, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Do$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L160, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Do(ctx, state2) {
@@ -17117,20 +17621,20 @@ var Dot$$ = [Dot$0, Dot$1];
 function Dot(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "Dot", Dot$$);
 }
-var DotDot$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L159, 'DotDot ".."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
+var DotDot$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L161, 'DotDot ".."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L7, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
-var DotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L160, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
+var DotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L162, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
   return { $loc, token: ".." };
 });
 var DotDot$$ = [DotDot$0, DotDot$1];
 function DotDot(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "DotDot", DotDot$$);
 }
-var DotDotDot$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L161, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+var DotDotDot$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L163, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
-var DotDotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L162, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
+var DotDotDot$1 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L164, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "..." };
 });
 var DotDotDot$$ = [DotDotDot$0, DotDotDot$1];
@@ -17143,31 +17647,31 @@ var InsertDotDotDot$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'Inse
 function InsertDotDotDot(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "InsertDotDotDot", InsertDotDotDot$0);
 }
-var DoubleColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L163, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+var DoubleColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L165, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function DoubleColon(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "DoubleColon", DoubleColon$0);
 }
-var DoubleColonAsColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L163, 'DoubleColonAsColon "::"'), function($skip, $loc, $0, $1) {
+var DoubleColonAsColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L165, 'DoubleColonAsColon "::"'), function($skip, $loc, $0, $1) {
   return { $loc, token: ":" };
 });
 function DoubleColonAsColon(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "DoubleColonAsColon", DoubleColonAsColon$0);
 }
-var DoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L164, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+var DoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L166, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function DoubleQuote(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "DoubleQuote", DoubleQuote$0);
 }
-var Each$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L165, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Each$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L167, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Each(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Each", Each$0);
 }
-var Else$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L166, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Else$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L168, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Else(ctx, state2) {
@@ -17179,61 +17683,61 @@ var Equals$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L3, 'Equals "="'),
 function Equals(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Equals", Equals$0);
 }
-var ExclamationPoint$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L167, 'ExclamationPoint "!"'), function($skip, $loc, $0, $1) {
+var ExclamationPoint$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L169, 'ExclamationPoint "!"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function ExclamationPoint(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ExclamationPoint", ExclamationPoint$0);
 }
-var Export$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L168, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Export$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L170, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Export(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Export", Export$0);
 }
-var Extends$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L169, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Extends$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L171, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Extends(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Extends", Extends$0);
 }
-var Finally$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L170, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Finally$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L172, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Finally(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Finally", Finally$0);
 }
-var For$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L171, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var For$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L173, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function For(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "For", For$0);
 }
-var From$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L172, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var From$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L174, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function From(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "From", From$0);
 }
-var Function$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L173, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Function$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L175, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Function2(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Function", Function$0);
 }
-var GetOrSet$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L174, 'GetOrSet "get"'), (0, import_lib2.$EXPECT)($L175, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var GetOrSet$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L176, 'GetOrSet "get"'), (0, import_lib2.$EXPECT)($L177, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "GetOrSet" };
 });
 function GetOrSet(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "GetOrSet", GetOrSet$0);
 }
-var Hash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L176, 'Hash "#"'), function($skip, $loc, $0, $1) {
+var Hash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L178, 'Hash "#"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function Hash(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Hash", Hash$0);
 }
-var If$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L177, 'If "if"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
+var If$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L179, 'If "if"'), NonIdContinue, (0, import_lib2.$E)((0, import_lib2.$EXPECT)($L18, 'If " "')))), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function If(ctx, state2) {
@@ -17245,67 +17749,67 @@ var Import$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)
 function Import(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Import", Import$0);
 }
-var In$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L178, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var In$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L180, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function In(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "In", In$0);
 }
-var Infer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L179, 'Infer "infer"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Infer$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L181, 'Infer "infer"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Infer(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Infer", Infer$0);
 }
-var LetOrConst$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L180, 'LetOrConst "let"'), (0, import_lib2.$EXPECT)($L181, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LetOrConst$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L182, 'LetOrConst "let"'), (0, import_lib2.$EXPECT)($L183, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function LetOrConst(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "LetOrConst", LetOrConst$0);
 }
-var Const$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L181, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Const$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L183, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Const(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Const", Const$0);
 }
-var Is$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L182, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Is$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L184, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Is(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Is", Is$0);
 }
-var LetOrConstOrVar$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L180, 'LetOrConstOrVar "let"'), (0, import_lib2.$EXPECT)($L181, 'LetOrConstOrVar "const"'), (0, import_lib2.$EXPECT)($L183, 'LetOrConstOrVar "var"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LetOrConstOrVar$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L182, 'LetOrConstOrVar "let"'), (0, import_lib2.$EXPECT)($L183, 'LetOrConstOrVar "const"'), (0, import_lib2.$EXPECT)($L185, 'LetOrConstOrVar "var"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function LetOrConstOrVar(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "LetOrConstOrVar", LetOrConstOrVar$0);
 }
-var Like$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L184, 'Like "like"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Like$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L186, 'Like "like"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Like(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Like", Like$0);
 }
-var Loop$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L185, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Loop$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L187, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: "while" };
 });
 function Loop(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Loop", Loop$0);
 }
-var New$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L186, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var New$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L188, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function New(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "New", New$0);
 }
-var Not$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L187, 'Not "not"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($L16, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+var Not$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L189, 'Not "not"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$EXPECT)($L16, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: "!" };
 });
 function Not(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Not", Not$0);
 }
-var Of$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L188, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Of$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L190, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Of(ctx, state2) {
@@ -17323,7 +17827,7 @@ var OpenBrace$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L1, 'OpenBrace
 function OpenBrace(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "OpenBrace", OpenBrace$0);
 }
-var OpenBracket$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L189, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+var OpenBracket$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L191, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function OpenBracket(ctx, state2) {
@@ -17335,49 +17839,49 @@ var OpenParen$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L4, 'OpenParen
 function OpenParen(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "OpenParen", OpenParen$0);
 }
-var Operator$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L190, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Operator$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L192, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Operator(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Operator", Operator$0);
 }
-var Override$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L191, 'Override "override"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Override$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L193, 'Override "override"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, ts: true };
 });
 function Override(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Override", Override$0);
 }
-var Own$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L192, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Own$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L194, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Own(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Own", Own$0);
 }
-var Public$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L193, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Public$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L195, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Public(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Public", Public$0);
 }
-var Private$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L194, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Private$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L196, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Private(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Private", Private$0);
 }
-var Protected$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L195, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Protected$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L197, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Protected(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Protected", Protected$0);
 }
-var Pipe$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L196, 'Pipe "||>"'), (0, import_lib2.$EXPECT)($L197, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
+var Pipe$0 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L198, 'Pipe "||>"'), (0, import_lib2.$EXPECT)($L199, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
   return { $loc, token: "||>" };
 });
-var Pipe$1 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L198, 'Pipe "|>="'), (0, import_lib2.$EXPECT)($L199, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
+var Pipe$1 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L200, 'Pipe "|>="'), (0, import_lib2.$EXPECT)($L201, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
   return { $loc, token: "|>=" };
 });
-var Pipe$2 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L200, 'Pipe "|>"'), (0, import_lib2.$EXPECT)($L201, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
+var Pipe$2 = (0, import_lib2.$TV)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L202, 'Pipe "|>"'), (0, import_lib2.$EXPECT)($L203, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
   return { $loc, token: "|>" };
 });
 var Pipe$$ = [Pipe$0, Pipe$1, Pipe$2];
@@ -17390,19 +17894,19 @@ var QuestionMark$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L6, 'Questio
 function QuestionMark(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "QuestionMark", QuestionMark$0);
 }
-var Readonly$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L202, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Readonly$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L204, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, ts: true };
 });
 function Readonly(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Readonly", Readonly$0);
 }
-var Return$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L203, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Return$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L205, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Return(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Return", Return$0);
 }
-var Satisfies$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L204, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Satisfies$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L206, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Satisfies(ctx, state2) {
@@ -17414,7 +17918,7 @@ var Semicolon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L119, 'Semicolo
 function Semicolon(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Semicolon", Semicolon$0);
 }
-var SingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L205, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+var SingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L207, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function SingleQuote(ctx, state2) {
@@ -17426,149 +17930,149 @@ var Star$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L75, 'Star "*"'), fu
 function Star(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Star", Star$0);
 }
-var Static$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L206, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Static$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L208, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
-var Static$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L144, 'Static "@"'), (0, import_lib2.$N)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L4, 'Static "("'), (0, import_lib2.$EXPECT)($L144, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+var Static$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L146, 'Static "@"'), (0, import_lib2.$N)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L4, 'Static "("'), (0, import_lib2.$EXPECT)($L146, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: "static " };
 });
 var Static$$ = [Static$0, Static$1];
 function Static(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "Static", Static$$);
 }
-var SubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L207, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+var SubstitutionStart$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L209, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
 function SubstitutionStart(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "SubstitutionStart", SubstitutionStart$0);
 }
-var Super$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L208, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Super$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L210, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Super(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Super", Super$0);
 }
-var Switch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L209, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Switch$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L211, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Switch(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Switch", Switch$0);
 }
-var Target$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L210, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Target$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L212, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Target(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Target", Target$0);
 }
-var Then$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L211, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+var Then$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L213, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: "" };
 });
 function Then(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Then", Then$0);
 }
-var This$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L212, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var This$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L214, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function This(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "This", This$0);
 }
-var Throw$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L213, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Throw$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L215, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Throw(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Throw", Throw$0);
 }
-var TripleDoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L214, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+var TripleDoubleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L216, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
   return { $loc, token: "`" };
 });
 function TripleDoubleQuote(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TripleDoubleQuote", TripleDoubleQuote$0);
 }
-var TripleSingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L215, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+var TripleSingleQuote$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L217, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
   return { $loc, token: "`" };
 });
 function TripleSingleQuote(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TripleSingleQuote", TripleSingleQuote$0);
 }
-var TripleSlash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L216, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+var TripleSlash$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L218, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "/" };
 });
 function TripleSlash(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TripleSlash", TripleSlash$0);
 }
-var TripleTick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L217, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+var TripleTick$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L219, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "`" };
 });
 function TripleTick(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TripleTick", TripleTick$0);
 }
-var Try$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L218, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Try$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L220, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Try(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Try", Try$0);
 }
-var Typeof$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L219, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Typeof$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L221, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Typeof(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Typeof", Typeof$0);
 }
-var Undefined$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L220, 'Undefined "undefined"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Undefined$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L222, 'Undefined "undefined"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Undefined(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Undefined", Undefined$0);
 }
-var Unless$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L221, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Unless$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L223, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, negated: true };
 });
 function Unless(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Unless", Unless$0);
 }
-var Until$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L222, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Until$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L224, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, negated: true };
 });
 function Until(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Until", Until$0);
 }
-var Using$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L223, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Using$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L225, 'Using "using"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Using(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Using", Using$0);
 }
-var Var$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L183, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Var$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L185, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Var(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Var", Var$0);
 }
-var Void$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L224, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Void$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L226, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Void(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Void", Void$0);
 }
-var When$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L225, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var When$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L227, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: "case" };
 });
 function When(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "When", When$0);
 }
-var While$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L226, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var While$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L228, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function While(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "While", While$0);
 }
-var With$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L132, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var With$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L134, 'With "with"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function With(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "With", With$0);
 }
-var Yield$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L227, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Yield$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L229, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1, type: "Yield" };
 });
 function Yield(ctx, state2) {
@@ -17645,7 +18149,7 @@ var JSXElement$$ = [JSXElement$0, JSXElement$1, JSXElement$2];
 function JSXElement(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXElement", JSXElement$$);
 }
-var JSXSelfClosingElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L228, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var JSXSelfClosingElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L19, 'JSXSelfClosingElement "<"'), JSXElementName, (0, import_lib2.$E)(TypeArguments), (0, import_lib2.$E)(JSXAttributes), (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L230, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   return { type: "JSXElement", children: $0, tag: $2 };
 });
 function JSXSelfClosingElement(ctx, state2) {
@@ -17678,7 +18182,7 @@ var JSXOptionalClosingElement$$ = [JSXOptionalClosingElement$0, JSXOptionalClosi
 function JSXOptionalClosingElement(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXOptionalClosingElement", JSXOptionalClosingElement$$);
 }
-var JSXClosingElement$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L229, 'JSXClosingElement "</"'), (0, import_lib2.$E)(Whitespace), JSXElementName, (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L45, 'JSXClosingElement ">"'));
+var JSXClosingElement$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L231, 'JSXClosingElement "</"'), (0, import_lib2.$E)(Whitespace), JSXElementName, (0, import_lib2.$E)(Whitespace), (0, import_lib2.$EXPECT)($L45, 'JSXClosingElement ">"'));
 function JSXClosingElement(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXClosingElement", JSXClosingElement$0);
 }
@@ -17698,7 +18202,7 @@ var JSXFragment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)
   ];
   return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
 });
-var JSXFragment$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeJSXEnabled, (0, import_lib2.$EXPECT)($L230, 'JSXFragment "<>"'), (0, import_lib2.$E)(JSXChildren), (0, import_lib2.$E)(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var JSXFragment$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeJSXEnabled, (0, import_lib2.$EXPECT)($L232, 'JSXFragment "<>"'), (0, import_lib2.$E)(JSXChildren), (0, import_lib2.$E)(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var children = $3;
   $0 = $0.slice(1);
   return {
@@ -17711,7 +18215,7 @@ var JSXFragment$$ = [JSXFragment$0, JSXFragment$1];
 function JSXFragment(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXFragment", JSXFragment$$);
 }
-var PushJSXOpeningFragment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L230, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+var PushJSXOpeningFragment$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L232, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
   state.JSXTagStack.push("");
   return $1;
 });
@@ -17727,11 +18231,11 @@ var JSXOptionalClosingFragment$$ = [JSXOptionalClosingFragment$0, JSXOptionalClo
 function JSXOptionalClosingFragment(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXOptionalClosingFragment", JSXOptionalClosingFragment$$);
 }
-var JSXClosingFragment$0 = (0, import_lib2.$EXPECT)($L231, 'JSXClosingFragment "</>"');
+var JSXClosingFragment$0 = (0, import_lib2.$EXPECT)($L233, 'JSXClosingFragment "</>"');
 function JSXClosingFragment(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "JSXClosingFragment", JSXClosingFragment$0);
 }
-var JSXElementName$0 = (0, import_lib2.$TV)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L176, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
+var JSXElementName$0 = (0, import_lib2.$TV)((0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$C)((0, import_lib2.$EXPECT)($L178, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
   return config.defaultElement;
 });
 var JSXElementName$1 = (0, import_lib2.$TEXT)((0, import_lib2.$S)(JSXIdentifierName, (0, import_lib2.$C)((0, import_lib2.$S)(Colon, JSXIdentifierName), (0, import_lib2.$Q)((0, import_lib2.$S)(Dot, JSXIdentifierName)))));
@@ -17908,7 +18412,7 @@ var JSXAttribute$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(Identifier, (0, im
   }
   return $skip;
 });
-var JSXAttribute$5 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L176, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+var JSXAttribute$5 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L178, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
   return [" ", "id=", $2];
 });
 var JSXAttribute$6 = (0, import_lib2.$TS)((0, import_lib2.$S)(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
@@ -18244,7 +18748,7 @@ var JSXChildGeneral$$ = [JSXChildGeneral$0, JSXChildGeneral$1, JSXChildGeneral$2
 function JSXChildGeneral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "JSXChildGeneral", JSXChildGeneral$$);
 }
-var JSXComment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L232, 'JSXComment "<!--"'), JSXCommentContent, (0, import_lib2.$EXPECT)($L233, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+var JSXComment$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L234, 'JSXComment "<!--"'), JSXCommentContent, (0, import_lib2.$EXPECT)($L235, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
   return ["{/*", $2, "*/}"];
 });
 function JSXComment(ctx, state2) {
@@ -18528,37 +19032,37 @@ var InterfaceExtendsTarget$0 = ImplementsTarget;
 function InterfaceExtendsTarget(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "InterfaceExtendsTarget", InterfaceExtendsTarget$0);
 }
-var TypeKeyword$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L234, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var TypeKeyword$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L236, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function TypeKeyword(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TypeKeyword", TypeKeyword$0);
 }
-var Enum$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L235, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Enum$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L237, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Enum(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Enum", Enum$0);
 }
-var Interface$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L236, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Interface$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L238, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Interface(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Interface", Interface$0);
 }
-var Global$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L237, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Global$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L239, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Global(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Global", Global$0);
 }
-var Module$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L238, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Module$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L240, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Module(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Module", Module$0);
 }
-var Namespace$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L239, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Namespace$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L241, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 function Namespace(ctx, state2) {
@@ -18867,7 +19371,7 @@ var ReturnTypeSuffix$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib
 function ReturnTypeSuffix(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ReturnTypeSuffix", ReturnTypeSuffix$0);
 }
-var ReturnType$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L240, 'ReturnType "asserts"'), NonIdContinue)), ForbidIndentedApplication, (0, import_lib2.$E)(TypePredicate), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
+var ReturnType$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L242, 'ReturnType "asserts"'), NonIdContinue)), ForbidIndentedApplication, (0, import_lib2.$E)(TypePredicate), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4) {
   var asserts = $1;
   var t = $3;
   if (!t) return $skip;
@@ -18960,8 +19464,8 @@ var TypeUnarySuffix$$ = [TypeUnarySuffix$0, TypeUnarySuffix$1, TypeUnarySuffix$2
 function TypeUnarySuffix(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeUnarySuffix", TypeUnarySuffix$$);
 }
-var TypeUnaryOp$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L241, 'TypeUnaryOp "keyof"'), NonIdContinue);
-var TypeUnaryOp$1 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L202, 'TypeUnaryOp "readonly"'), NonIdContinue);
+var TypeUnaryOp$0 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L243, 'TypeUnaryOp "keyof"'), NonIdContinue);
+var TypeUnaryOp$1 = (0, import_lib2.$S)((0, import_lib2.$EXPECT)($L204, 'TypeUnaryOp "readonly"'), NonIdContinue);
 var TypeUnaryOp$$ = [TypeUnaryOp$0, TypeUnaryOp$1];
 function TypeUnaryOp(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeUnaryOp", TypeUnaryOp$$);
@@ -18991,7 +19495,7 @@ var TypeIndexedAccess$$ = [TypeIndexedAccess$0, TypeIndexedAccess$1, TypeIndexed
 function TypeIndexedAccess(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIndexedAccess", TypeIndexedAccess$$);
 }
-var UnknownAlias$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L242, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
+var UnknownAlias$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L244, 'UnknownAlias "???"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "unknown" };
 });
 function UnknownAlias(ctx, state2) {
@@ -18999,9 +19503,11 @@ function UnknownAlias(ctx, state2) {
 }
 var TypePrimary$0 = (0, import_lib2.$S)((0, import_lib2.$E)(_), Infer, (0, import_lib2.$E)(_), IdentifierName, (0, import_lib2.$E)((0, import_lib2.$S)(NotDedented, ExtendsToken, Type)));
 var TypePrimary$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Typeof, (0, import_lib2.$E)(_), UnaryExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var expression = $4;
   return {
-    type: "TypeofType",
-    children: $0
+    type: "TypeTypeof",
+    children: $0,
+    expression
   };
 });
 var TypePrimary$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), TypeTuple), function($skip, $loc, $0, $1, $2) {
@@ -19366,13 +19872,13 @@ var TypeLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EX
   if (sign[0] === "+") return num;
   return $0;
 });
-var TypeLiteral$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L224, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var TypeLiteral$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L226, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
   return { type: "VoidType", $loc, token: $1 };
 });
-var TypeLiteral$4 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L243, 'TypeLiteral "unique"'), _, (0, import_lib2.$EXPECT)($L244, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+var TypeLiteral$4 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L245, 'TypeLiteral "unique"'), _, (0, import_lib2.$EXPECT)($L246, 'TypeLiteral "symbol"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
   return { type: "UniqueSymbolType", children: $0 };
 });
-var TypeLiteral$5 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L245, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+var TypeLiteral$5 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L247, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
   return { $loc, token: "[]" };
 });
 var TypeLiteral$$ = [TypeLiteral$0, TypeLiteral$1, TypeLiteral$2, TypeLiteral$3, TypeLiteral$4, TypeLiteral$5];
@@ -19391,7 +19897,7 @@ var InlineInterfacePropertyDelimiter$0 = (0, import_lib2.$C)((0, import_lib2.$S)
 var InlineInterfacePropertyDelimiter$1 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)((0, import_lib2.$S)(SameLineOrIndentedFurther, InlineBasicInterfaceProperty)), InsertComma), function(value) {
   return value[1];
 });
-var InlineInterfacePropertyDelimiter$2 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L16, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib2.$EXPECT)($L141, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib2.$EXPECT)($L37, 'InlineInterfacePropertyDelimiter "}"'))));
+var InlineInterfacePropertyDelimiter$2 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$C)((0, import_lib2.$EXPECT)($L16, 'InlineInterfacePropertyDelimiter ":"'), (0, import_lib2.$EXPECT)($L143, 'InlineInterfacePropertyDelimiter ")"'), (0, import_lib2.$EXPECT)($L46, 'InlineInterfacePropertyDelimiter "]"'), (0, import_lib2.$EXPECT)($L37, 'InlineInterfacePropertyDelimiter "}"'))));
 var InlineInterfacePropertyDelimiter$3 = (0, import_lib2.$Y)(EOS);
 var InlineInterfacePropertyDelimiter$$ = [InlineInterfacePropertyDelimiter$0, InlineInterfacePropertyDelimiter$1, InlineInterfacePropertyDelimiter$2, InlineInterfacePropertyDelimiter$3];
 function InlineInterfacePropertyDelimiter(ctx, state2) {
@@ -19631,7 +20137,7 @@ var CivetPrologue$$ = [CivetPrologue$0, CivetPrologue$1];
 function CivetPrologue(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
 }
-var CivetPrologueContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L246, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib2.$Q)(CivetOption), (0, import_lib2.$EXPECT)($R98, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+var CivetPrologueContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L248, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib2.$Q)(CivetOption), (0, import_lib2.$EXPECT)($R98, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
   var options = $3;
   return {
     type: "CivetPrologue",
@@ -20340,7 +20846,7 @@ __export(sourcemap_civet_exports, {
   locationTable: () => locationTable,
   lookupLineColumn: () => lookupLineColumn
 });
-var locationTable = function(input) {
+function locationTable(input) {
   const linesRe = /([^\r\n]*)(\r\n|\r|\n|$)/y;
   const lines = [];
   let line = 0;
@@ -20355,96 +20861,108 @@ var locationTable = function(input) {
     }
   }
   return lines;
-};
-var lookupLineColumn = function(table, pos) {
+}
+function lookupLineColumn(table, pos) {
   let l = 0;
   let prevEnd = 0;
   while (table[l] <= pos) {
     prevEnd = table[l++];
   }
   return [l, pos - prevEnd];
-};
-var SourceMap = function(sourceString) {
-  const srcTable = locationTable(sourceString);
-  const sm = {
-    lines: [[]],
-    line: 0,
-    colOffset: 0,
-    // relative to previous entry
-    srcLine: 0,
-    srcColumn: 0,
-    srcOffset: 0,
-    srcTable
-  };
-  const EOL2 = /\r?\n|\r/;
-  return {
-    data: sm,
-    source: function() {
-      return sourceString;
-    },
-    renderMappings: function() {
-      let lastSourceLine = 0;
-      let lastSourceColumn = 0;
-      return sm.lines.map((line) => {
-        return line.map((entry) => {
-          if (entry.length === 4) {
-            let [colDelta, sourceFileIndex, srcLine, srcCol] = entry;
-            const lineDelta = srcLine - lastSourceLine;
-            colDelta = srcCol - lastSourceColumn;
-            lastSourceLine = srcLine;
-            lastSourceColumn = srcCol;
-            return `${encodeVlq(entry[0])}${encodeVlq(sourceFileIndex)}${encodeVlq(lineDelta)}${encodeVlq(colDelta)}`;
-          } else {
-            return encodeVlq(entry[0]);
+}
+var EOL2 = /\r?\n|\r/;
+var SourceMap = class {
+  lines;
+  line;
+  colOffset;
+  // relative to previous entry
+  srcLine;
+  srcColumn;
+  srcOffset;
+  srcTable;
+  source;
+  constructor(source1) {
+    this.source = source1;
+    this.lines = [[]];
+    this.line = 0;
+    this.colOffset = 0;
+    this.srcLine = 0;
+    this.srcColumn = 0;
+    this.srcOffset = 0;
+    this.srcTable = locationTable(this.source);
+  }
+  renderMappings() {
+    let lastSourceLine = 0;
+    let lastSourceColumn = 0;
+    return (() => {
+      const results = [];
+      for (let ref1 = this.lines, i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
+        const line = ref1[i1];
+        results.push((() => {
+          const results1 = [];
+          for (let i2 = 0, len1 = line.length; i2 < len1; i2++) {
+            const entry = line[i2];
+            if (entry.length === 4) {
+              let [colDelta, sourceFileIndex, srcLine, srcCol] = entry;
+              const lineDelta = srcLine - lastSourceLine;
+              colDelta = srcCol - lastSourceColumn;
+              lastSourceLine = srcLine;
+              lastSourceColumn = srcCol;
+              results1.push(`${encodeVlq(entry[0])}${encodeVlq(sourceFileIndex)}${encodeVlq(lineDelta)}${encodeVlq(colDelta)}`);
+            } else {
+              results1.push(encodeVlq(entry[0]));
+            }
           }
-        }).join(",");
-      }).join(";");
-    },
-    json: function(srcFileName, outFileName) {
-      return {
-        version: 3,
-        file: outFileName,
-        sources: [srcFileName],
-        mappings: this.renderMappings(),
-        names: [],
-        sourcesContent: [sourceString],
-        toString: function() {
-          return JSON.stringify(this);
-        }
-      };
-    },
-    updateSourceMap: function(outputStr, inputPos, colOffset = 0) {
-      const outLines = outputStr.split(EOL2);
-      let srcLine, srcCol;
+          return results1;
+        })().join(","));
+      }
+      return results;
+    })().join(";");
+  }
+  json(srcFileName, outFileName) {
+    return {
+      version: 3,
+      file: outFileName,
+      sources: [srcFileName],
+      mappings: this.renderMappings(),
+      names: [],
+      sourcesContent: [this.source],
+      toString: function() {
+        return JSON.stringify(this);
+      }
+    };
+  }
+  updateSourceMap(outputStr, inputPos, colOffset = 0) {
+    const outLines = outputStr.split(EOL2);
+    let srcLine, srcCol;
+    if (inputPos != null) {
+      [srcLine, srcCol] = lookupLineColumn(this.srcTable, inputPos);
+      srcCol += colOffset;
+      this.srcLine = srcLine;
+      this.srcColumn = srcCol;
+      this.srcOffset = inputPos + outputStr.length;
+    }
+    for (let i3 = 0, len22 = outLines.length; i3 < len22; i3++) {
+      const i = i3;
+      const line = outLines[i3];
+      if (i > 0) {
+        this.line++;
+        this.srcLine++;
+        this.colOffset = 0;
+        this.lines[this.line] = [];
+        this.srcColumn = srcCol = colOffset;
+      }
+      const l = this.colOffset;
+      this.colOffset = line.length;
+      this.srcColumn += line.length;
       if (inputPos != null) {
-        [srcLine, srcCol] = lookupLineColumn(srcTable, inputPos);
-        srcCol += colOffset;
-        sm.srcLine = srcLine;
-        sm.srcColumn = srcCol;
-        sm.srcOffset = inputPos + outputStr.length;
-      }
-      for (let i1 = 0, len3 = outLines.length; i1 < len3; i1++) {
-        const i = i1;
-        const line = outLines[i1];
-        if (i > 0) {
-          sm.line++;
-          sm.srcLine++;
-          sm.colOffset = 0;
-          sm.lines[sm.line] = [];
-          sm.srcColumn = srcCol = colOffset;
-        }
-        const l = sm.colOffset;
-        sm.colOffset = line.length;
-        sm.srcColumn += line.length;
-        if (inputPos != null) {
-          sm.lines[sm.line].push([l, 0, srcLine + i, srcCol]);
-        } else if (l != 0) {
-          sm.lines[sm.line].push([l]);
-        }
+        this.lines[this.line].push([l, 0, srcLine + i, srcCol]);
+      } else if (l != 0) {
+        this.lines[this.line].push([l]);
       }
-      return;
     }
-  };
+    return;
+  }
 };
 var smRegexp = /\n\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,([+a-zA-Z0-9\/]*=?=?)$/;
 var remap = function(codeWithSourceMap, upstreamMap, sourcePath, targetPath) {
@@ -20455,8 +20973,8 @@ var remap = function(codeWithSourceMap, upstreamMap, sourcePath, targetPath) {
   });
   if (sourceMapText) {
     const parsed = parseWithLines(sourceMapText);
-    const composedLines = composeLines(upstreamMap.data.lines, parsed.lines);
-    upstreamMap.data.lines = composedLines;
+    const composedLines = composeLines(upstreamMap.lines, parsed.lines);
+    upstreamMap.lines = composedLines;
   }
   const remappedSourceMapJSON = upstreamMap.json(sourcePath, targetPath);
   const newSourceMap = `${"sourceMapping"}URL=data:application/json;charset=utf-8;base64,${base64Encode(JSON.stringify(remappedSourceMapJSON))}`;
@@ -20518,10 +21036,10 @@ var VLQ_CONTINUATION_BIT = 1 << VLQ_SHIFT;
 var VLQ_VALUE_MASK = VLQ_CONTINUATION_BIT - 1;
 var encodeVlq = function(value) {
   let answer = "";
-  let ref1;
-  if (value < 0) ref1 = 1;
-  else ref1 = 0;
-  const signBit = ref1;
+  let ref2;
+  if (value < 0) ref2 = 1;
+  else ref2 = 0;
+  const signBit = ref2;
   let valueToEncode = (Math.abs(value) << 1) + signBit;
   while (valueToEncode || !answer) {
     let nextChunk = valueToEncode & VLQ_VALUE_MASK;
@@ -20693,8 +21211,8 @@ var WorkerPool = class {
   async run(op, ...args) {
     const id = this.jobId++;
     return await new Promise(async (resolve2, reject) => {
-      this.callbacks.set(id, { resolve: resolve2, reject });
       const job = { id, op, args };
+      this.callbacks.set(id, { job, resolve: resolve2, reject });
       if (this.idle.length) {
         const worker = this.idle.shift();
         worker.ref();
@@ -20715,8 +21233,32 @@ var WorkerPool = class {
       const callback = this.callbacks.get(response.id);
       this.callbacks.delete(response.id);
       if (response.error) {
-        callback.reject(response.error);
+        const message = `${response.error.name}: ${response.error.message}`;
+        let ref;
+        if (response.error.type in globalThis) {
+          ref = new globalThis[response.error.type](message);
+        } else {
+          ref = new Error(message);
+        }
+        ;
+        const error = ref;
+        try {
+          error.name = response.error.name;
+        } catch (e) {
+        }
+        callback.reject(error);
       } else {
+        let ref1;
+        if (ref1 = response.result?.sourceMap) {
+          const sourceMap = ref1;
+          response.result.sourceMap = new SourceMap(sourceMap.source);
+          Object.assign(response.result.sourceMap, sourceMap);
+        }
+        let ref2;
+        if (ref2 = callback.job.args[1]?.errors) {
+          const errors = ref2;
+          errors.splice(0, 1 / 0, ...response.errors);
+        }
         callback.resolve(response.result);
       }
       if (this.spawned > this.threads) {
@@ -20900,7 +21442,7 @@ ${counts}`;
       return;
     }
     if (options.sourceMap || options.inlineMap) {
-      options.sourceMap = SourceMap2(src);
+      options.sourceMap = new SourceMap2(src);
       const code = generate_civet_default(ast2, options);
       checkErrors();
       if (options.inlineMap) {
@@ -20915,7 +21457,7 @@ ${counts}`;
     const result = generate_civet_default(ast2, options);
     if (options.errors?.length) {
       delete options.errors;
-      options.sourceMap = SourceMap2(src);
+      options.sourceMap = new SourceMap2(src);
       generate_civet_default(ast2, options);
       checkErrors();
     }