@danielx/civet 0.9.3 → 0.9.5

package/dist/main.mjs

@@ -56,7 +56,7 @@ var require_machine = __commonJS({
       $EVENT: () => $EVENT2,
       $EVENT_C: () => $EVENT_C2,
       $EXPECT: () => $EXPECT2,
-      $L: () => $L247,
+      $L: () => $L249,
       $N: () => $N2,
       $P: () => $P2,
       $Q: () => $Q2,
@@ -81,7 +81,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) {
@@ -1631,6 +1631,15 @@ function gatherRecursiveAll(node, predicate) {
 }
 
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
+var range = (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;
+};
 function makeRef(base = "ref", id = base) {
   return {
     type: "Ref",
@@ -1643,7 +1652,7 @@ function needsRef(expression, base = "ref") {
     return;
   }
   if (Array.isArray(expression)) {
-    const nonempty = ((s) => Array.from({ length: expression.length - s }, (_2, i) => s + i))(0).filter((i) => !isWhitespaceOrEmpty(expression[i]));
+    const nonempty = range(0, expression.length).filter((i) => !isWhitespaceOrEmpty(expression[i]));
     if (nonempty.length === 1) {
       let ref1;
       if (ref1 = needsRef(expression[nonempty[0]], base)) {
@@ -1659,8 +1668,9 @@ function needsRef(expression, base = "ref") {
     case "Ref":
     case "Identifier":
     case "Literal":
-    case "Placeholder":
+    case "Placeholder": {
       return;
+    }
   }
   return makeRef(base);
 }
@@ -1690,10 +1700,34 @@ function maybeRefAssignment(exp, base = "ref") {
     return { ref, ...makeRefAssignment(ref, exp) };
   }
 }
+function populateRefs(statements) {
+  const refNodes = gatherRecursive(statements, ($) => $.type === "Ref");
+  if (!refNodes.length) {
+    return;
+  }
+  const ids = gatherRecursive(statements, ($1) => $1.type === "Identifier");
+  const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
+  for (let i1 = 0, len3 = refNodes.length; i1 < len3; i1++) {
+    const ref = refNodes[i1];
+    if (!(ref.type === "Ref")) {
+      continue;
+    }
+    const { base } = ref;
+    ref.type = "Identifier";
+    let n = 0;
+    let name = base;
+    while (names.has(name)) {
+      n++;
+      name = `${base}${n}`;
+    }
+    names.add(name);
+    ref.children = ref.names = [name];
+  }
+}
 
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
 function adjustAtBindings(statements, asThis = false) {
-  for (let ref1 = gatherRecursiveAll(statements, ($) => $.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
+  for (let ref1 = gatherRecursiveAll(statements, ($1) => $1.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
     const binding = ref1[i1];
     const { ref } = binding;
     if (asThis) {
@@ -1711,7 +1745,7 @@ function adjustAtBindings(statements, asThis = false) {
   }
 }
 function adjustBindingElements(elements) {
-  const names = elements.flatMap(($1) => $1.names || []);
+  const names = elements.flatMap(($2) => $2.names || []);
   const { length } = elements;
   let blockPrefix, restIndex = -1, restCount = 0;
   for (let i2 = 0, len1 = elements.length; i2 < len1; i2++) {
@@ -1769,16 +1803,40 @@ function adjustBindingElements(elements) {
     length
   };
 }
+function gatherSubbindings(node, subbindings = []) {
+  for (let ref2 = gatherRecursiveAll(node, ($) => $.subbinding != null), i3 = 0, len22 = ref2.length; i3 < len22; i3++) {
+    const p = ref2[i3];
+    const { subbinding } = p;
+    subbindings.push(", ", subbinding);
+    gatherSubbindings(subbinding, subbindings);
+  }
+  return subbindings;
+}
+function simplifyBindingProperties(node) {
+  const results = [];
+  for (let ref3 = gatherRecursiveAll(node, ($3) => $3.type === "BindingProperty"), i4 = 0, len3 = ref3.length; i4 < len3; i4++) {
+    const p = ref3[i4];
+    const { name, value } = p;
+    if (value?.type === "NamedBindingPattern" && value.binding === name) {
+      const [ws] = p.children;
+      results.push(p.children = [ws, name, p.delim]);
+    } else {
+      results.push(void 0);
+    }
+  }
+  ;
+  return results;
+}
 function gatherBindingCode(statements, opts) {
   const thisAssignments = [];
   const splices = [];
   function insertRestSplices(s, p, thisAssignments2) {
     let m;
-    for (let ref2 = gatherRecursiveAll(
+    for (let ref4 = 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];
+    ), i5 = 0, len4 = ref4.length; i5 < len4; i5++) {
+      let n = ref4[i5];
       if (n.type === "AtBinding") {
         const { ref } = n;
         const { id } = ref;
@@ -1787,7 +1845,7 @@ function gatherBindingCode(statements, opts) {
       }
       if (opts?.assignPins) {
         if (n.type === "PinProperty") {
-          n.children = n.children.flatMap(($2) => $2 === n.name ? [n.name, ": ", n.value] : $2);
+          n.children = n.children.flatMap(($4) => $4 === n.name ? [n.name, ": ", n.value] : $4);
           updateParentPointers(n);
           n = n.value;
         }
@@ -1809,8 +1867,8 @@ function gatherBindingCode(statements, opts) {
         }
       }
       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];
+        for (let ref5 = n.names, i6 = 0, len5 = ref5.length; i6 < len5; i6++) {
+          const id = ref5[i6];
           thisAssignments2.push({
             type: "AssignmentExpression",
             children: [`this.${id} = `, id],
@@ -1828,8 +1886,8 @@ function gatherBindingCode(statements, opts) {
   return [splices, thisAssignments];
 }
 function arrayElementHasTrailingComma(elementNode) {
-  let ref4;
-  const lastChild = (ref4 = elementNode.children)[ref4.length - 1];
+  let ref6;
+  const lastChild = (ref6 = elementNode.children)[ref6.length - 1];
   return lastChild && lastChild[lastChild.length - 1]?.token === ",";
 }
 function gatherBindingPatternTypeSuffix(pattern) {
@@ -1840,9 +1898,9 @@ function gatherBindingPatternTypeSuffix(pattern) {
   switch (pattern.type) {
     case "ArrayBindingPattern": {
       {
-        const results = [];
-        for (let ref5 = pattern.elements, i5 = 0, len4 = ref5.length; i5 < len4; i5++) {
-          const elem = ref5[i5];
+        const results1 = [];
+        for (let ref7 = pattern.elements, i7 = 0, len6 = ref7.length; i7 < len6; i7++) {
+          const elem = ref7[i7];
           let { typeSuffix } = elem;
           typeSuffix ??= elem.binding?.typeSuffix;
           if (typeSuffix) {
@@ -1859,10 +1917,10 @@ function gatherBindingPatternTypeSuffix(pattern) {
           } else {
             typeElement[0] ??= "unknown";
           }
-          results.push(typeElement);
+          results1.push(typeElement);
         }
         ;
-        const types = results;
+        const types = results1;
         if (count) {
           const t = [": [", types, "]"];
           pattern.typeSuffix = {
@@ -1879,9 +1937,9 @@ function gatherBindingPatternTypeSuffix(pattern) {
     case "ObjectBindingPattern": {
       {
         let restType;
-        const results1 = [];
-        for (let ref6 = pattern.properties, i6 = 0, len5 = ref6.length; i6 < len5; i6++) {
-          const prop = ref6[i6];
+        const results2 = [];
+        for (let ref8 = pattern.properties, i8 = 0, len7 = ref8.length; i8 < len7; i8++) {
+          const prop = ref8[i8];
           let { typeSuffix } = prop;
           typeSuffix ??= prop.value?.typeSuffix;
           if (typeSuffix) {
@@ -1895,12 +1953,12 @@ function gatherBindingPatternTypeSuffix(pattern) {
           switch (prop.type) {
             case "BindingProperty": {
               const ws = prop.children.slice(0, prop.children.indexOf(prop.name));
-              results1.push([...ws, prop.name, typeSuffix, prop.delim]);
+              results2.push([...ws, prop.name, typeSuffix, prop.delim]);
               break;
             }
             case "AtBindingProperty": {
               const ws = prop.children.slice(0, prop.children.indexOf(prop.binding));
-              results1.push([...ws, prop.ref.id, typeSuffix, prop.delim]);
+              results2.push([...ws, prop.ref.id.replace(/^#/, ""), typeSuffix, prop.delim]);
               break;
             }
             case "BindingRestProperty": {
@@ -1910,7 +1968,7 @@ function gatherBindingPatternTypeSuffix(pattern) {
           }
         }
         ;
-        const types = results1;
+        const types = results2;
         if (count) {
           const t = ["{", types, "}"];
           if (restType != null) {
@@ -1991,16 +2049,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",
@@ -2019,6 +2079,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]
@@ -2161,9 +2287,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
@@ -2175,7 +2320,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)) {
@@ -2200,15 +2346,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(
@@ -3259,9 +3405,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`);
@@ -3305,6 +3472,9 @@ function iterationDeclaration(statement) {
         case "every": {
           return "true";
         }
+        case "first": {
+          return "undefined";
+        }
         case "min": {
           return "Infinity";
         }
@@ -3317,6 +3487,9 @@ function iterationDeclaration(statement) {
         case "join": {
           return '""';
         }
+        case "concat": {
+          return "[]";
+        }
         default: {
           return "0";
         }
@@ -3361,10 +3534,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];
           }
@@ -3418,31 +3597,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;
 }
@@ -3503,7 +3685,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);
@@ -3514,14 +3696,15 @@ function processParams(f) {
     parameters.names.push(...rest.names || []);
     rest.children.pop();
     if (after.length) {
-      if (rest.binding.type === "ArrayBindingPattern" || rest.binding.type === "ObjectBindingPattern") {
+      let m4;
+      if (m4 = rest.binding.type, m4 === "ArrayBindingPattern" || m4 === "ObjectBindingPattern" || m4 === "NamedBindingPattern") {
         parameters.parameters.push({
           type: "Error",
           message: "Non-end rest parameter cannot be binding pattern"
         });
       }
       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;
@@ -3610,9 +3793,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
@@ -3646,25 +3829,28 @@ function processParams(f) {
     injectParamProps: isConstructor,
     assignPins: true
   });
+  const subbindings = gatherSubbindings(parameters.parameters);
+  simplifyBindingProperties(parameters.parameters);
+  simplifyBindingProperties(subbindings);
   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 index2 = findChildIndex(classExpressions, f);
       assert.notEqual(index2, -1, "Could not find constructor in class");
-      let m4;
-      while (m4 = classExpressions[index2 - 1]?.[1], typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "MethodDefinition" && "name" in m4 && m4.name === "constructor") {
+      let m5;
+      while (m5 = classExpressions[index2 - 1]?.[1], typeof m5 === "object" && m5 != null && "type" in m5 && m5.type === "MethodDefinition" && "name" in m5 && m5.name === "constructor") {
         index2--;
       }
       const fStatement = classExpressions[index2];
-      for (let ref18 = gatherRecursive(parameters, ($13) => $13.type === "Parameter"), i9 = 0, len8 = ref18.length; i9 < len8; i9++) {
+      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)) {
@@ -3694,6 +3880,15 @@ function processParams(f) {
     children: [";"]
   };
   let prefix = [];
+  if (subbindings.length) {
+    prefix.push(makeNode({
+      type: "Declaration",
+      children: ["const ", subbindings.slice(1)],
+      names: subbindings.flatMap(($16) => $16.names ?? []),
+      bindings: [],
+      decl: "const"
+    }));
+  }
   for (let ref20 = splices, i11 = 0, len10 = ref20.length; i11 < len10; i11++) {
     const binding = ref20[i11];
     assert.equal(binding.type, "PostRestBindingElements", "splice should be of type Binding");
@@ -3747,7 +3942,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, ($17) => $17.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, {
@@ -3762,9 +3957,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, ($18) => $18.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(($19) => $19.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}`
@@ -3777,7 +3972,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, ($20) => $20.type === "FunctionExpression" || $20.type === "ArrowFunction" || $20.type === "MethodDefinition"), i14 = 0, len13 = ref23.length; i14 < len13; i14++) {
     const f = ref23[i14];
     if (f.type === "FunctionExpression" || f.type === "MethodDefinition") {
       implicitFunctionBlock(f);
@@ -3789,7 +3984,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");
   }
@@ -3800,12 +3995,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 {
@@ -3853,7 +4042,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, ($21) => $21.type === "IterationExpression"), i15 = 0, len14 = ref25.length; i15 < len14; i15++) {
     const s = ref25[i15];
     expressionizeIteration(s);
   }
@@ -3903,12 +4092,12 @@ function processCoffeeDo(ws, expression) {
     const newParameters = {
       ...parameters,
       parameters: newParameterList,
-      children: parameters.children.map(($20) => $20 === parameterList ? newParameterList : $20)
+      children: parameters.children.map(($22) => $22 === parameterList ? newParameterList : $22)
     };
     expression = {
       ...expression,
       parameters: newParameters,
-      children: expression.children.map(($21) => $21 === parameters ? newParameters : $21)
+      children: expression.children.map(($23) => $23 === parameters ? newParameters : $23)
     };
   }
   return {
@@ -3930,7 +4119,7 @@ function makeAmpersandFunction(rhs) {
     ref = makeRef("$");
     inplacePrepend(ref, body);
   }
-  if (startsWithPredicate(body, ($22) => $22.type === "ObjectExpression")) {
+  if (startsWithPredicate(body, ($24) => $24.type === "ObjectExpression")) {
     body = makeLeftHandSideExpression(body);
   }
   const parameterList = [
@@ -4726,17 +4915,15 @@ function getPatternConditions(pattern, ref, conditions = []) {
       break;
     }
     case "ConditionFragment": {
-      let { children } = pattern;
-      if (children.length) {
-        let [first, ...rest] = children;
+      let { rhs } = pattern;
+      if (rhs.length) {
+        let [first, ...rest] = rhs;
         let [ws, ...op] = first;
         ws = [" "].concat(ws);
         first = [ws, ...op];
-        children = [first, ...rest];
+        rhs = [first, ...rest];
       }
-      conditions.push(
-        processBinaryOpExpression([ref, children])
-      );
+      conditions.push(processBinaryOpExpression([ref, rhs]));
       break;
     }
     case "RegularExpressionLiteral": {
@@ -4754,6 +4941,10 @@ function getPatternConditions(pattern, ref, conditions = []) {
       ]);
       break;
     }
+    case "NamedBindingPattern": {
+      getPatternConditions(pattern.pattern, ref, conditions);
+      break;
+    }
     case "Literal": {
       conditions.push([
         ref,
@@ -4783,27 +4974,51 @@ function getPatternBlockPrefix(pattern, ref, decl = "const ", typeSuffix) {
     }
     case "Literal":
     case "RegularExpressionLiteral":
-    case "PinPattern":
-    case "ConditionFragment": {
+    case "PinPattern": {
       return;
     }
+    case "ConditionFragment": {
+      if (!pattern.binding) {
+        return;
+      }
+      ;
+      break;
+    }
   }
   let [splices, thisAssignments] = gatherBindingCode(pattern);
   const patternBindings2 = nonMatcherBindings(pattern);
-  splices = splices.map((s) => [", ", nonMatcherBindings(s)]);
+  const subbindings = gatherSubbindings(patternBindings2);
+  simplifyBindingProperties(patternBindings2);
+  simplifyBindingProperties(subbindings);
+  splices = splices.flatMap((s) => [", ", nonMatcherBindings(s)]);
   thisAssignments = thisAssignments.map(($7) => ["", $7, ";"]);
-  const duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices]);
-  return [
-    ["", {
+  const duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices, subbindings]);
+  const blockPrefix = [];
+  if (ref || subbindings.length || splices.length) {
+    const children = [decl];
+    if (ref) {
+      children.push(patternBindings2, typeSuffix, " = ", ref);
+    }
+    children.push(...subbindings);
+    children.push(...splices);
+    if (!ref) {
+      children.splice(1, 1);
+    }
+    blockPrefix.push(["", {
       type: "Declaration",
-      children: [decl, patternBindings2, typeSuffix, " = ", ref, ...splices],
+      children,
+      decl,
       names: [],
       bindings: []
       // avoid implicit return of any bindings
-    }, ";"],
-    ...thisAssignments,
-    ...duplicateDeclarations.map(($8) => ["", $8, ";"])
-  ];
+    }, ";"]);
+  }
+  blockPrefix.push(...thisAssignments);
+  blockPrefix.push(...duplicateDeclarations.map(($8) => ["", $8, ";"]));
+  if (!blockPrefix.length) {
+    return;
+  }
+  return blockPrefix;
 }
 function elideMatchersFromArrayBindings(elements) {
   const results = [];
@@ -4844,45 +5059,75 @@ function elideMatchersFromArrayBindings(elements) {
   return results;
 }
 function elideMatchersFromPropertyBindings(properties) {
-  return properties.map((p) => {
+  const results1 = [];
+  for (let i6 = 0, len5 = properties.length; i6 < len5; i6++) {
+    const p = properties[i6];
     switch (p.type) {
-      case "BindingProperty": {
+      case "BindingProperty":
+      case "PinProperty": {
         const { children, name, value } = p;
         const [ws] = children;
         const shouldElide = name.type === "NumericLiteral" && !value?.name || name.type === "ComputedPropertyName" && value?.subtype === "NumericLiteral";
         if (shouldElide) {
-          return;
-        }
-        switch (value && value.type) {
-          case "ArrayBindingPattern":
-          case "ObjectBindingPattern": {
-            const bindings = nonMatcherBindings(value);
-            return {
-              ...p,
-              children: [ws, name, bindings && ": ", bindings, p.delim]
-            };
+          continue;
+        } else {
+          let contents;
+          let m1;
+          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;
+            }
+            case "NamedBindingPattern": {
+              const bindings = nonMatcherBindings(value.pattern);
+              contents = {
+                ...p,
+                subbinding: (m1 = bindings?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern" || m1 === "Identifier") ? [
+                  bindings,
+                  " = ",
+                  name
+                ] : void 0
+              };
+              if (p.name === value.binding) {
+                contents.children = [ws, name, p.delim];
+              }
+              ;
+              break;
+            }
+            default: {
+              contents = void 0;
+            }
           }
-          case "Identifier": {
-            return p;
+          if (contents) {
+            results1.push(contents);
+          } else {
+            continue;
           }
-          case "Literal":
-          case "RegularExpressionLiteral":
-          case "StringLiteral":
-          default:
-            return {
-              ...p,
-              children: [ws, name, p.delim]
-            };
         }
+        ;
+        break;
+      }
+      default: {
+        results1.push(p);
       }
-      case "PinProperty":
-      case "BindingRestProperty":
-      default:
-        return p;
     }
-  });
+  }
+  ;
+  return results1;
 }
 function nonMatcherBindings(pattern) {
+  let m2;
   switch (pattern.type) {
     case "ArrayBindingPattern":
     case "PostRestBindingElements": {
@@ -4901,6 +5146,16 @@ function nonMatcherBindings(pattern) {
         children: pattern.children.map(($10) => $10 === pattern.properties ? properties : $10)
       });
     }
+    case "NamedBindingPattern": {
+      const bindings = nonMatcherBindings(pattern.pattern);
+      return makeNode({
+        ...pattern,
+        subbinding: (m2 = bindings?.type, m2 === "ArrayBindingPattern" || m2 === "ObjectBindingPattern" || m2 === "Identifier") ? [bindings, " = ", pattern.binding] : void 0
+      });
+    }
+    case "ConditionFragment": {
+      return pattern.binding;
+    }
     default: {
       return pattern;
     }
@@ -4916,11 +5171,11 @@ 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 i7 = 0, len6 = props.length; i7 < len6; i7++) {
+    const p = props[i7];
     const { name, value } = p;
-    let m1;
-    if (m1 = value?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern") {
+    let m3;
+    if (m3 = value?.type, m3 === "ArrayBindingPattern" || m3 === "ObjectBindingPattern") {
       continue;
     }
     const key = value?.name || name?.name || name;
@@ -4942,8 +5197,8 @@ function aggregateDuplicateBindings(bindings) {
       pos: 0,
       input: key
     })) {
-      for (let i7 = 0, len6 = shared.length; i7 < len6; i7++) {
-        const p = shared[i7];
+      for (let i8 = 0, len7 = shared.length; i8 < len7; i8++) {
+        const p = shared[i8];
         aliasBinding(p, makeRef(`_${key}`, key));
       }
       return;
@@ -5035,8 +5290,18 @@ function processDeclarations(statements) {
     if (!(bindings != null)) {
       continue;
     }
-    for (let i2 = 0, len22 = bindings.length; i2 < len22; i2++) {
-      const binding = bindings[i2];
+    for (let i2 = bindings.length + -1; i2 >= 0; --i2) {
+      const i = i2;
+      const binding = bindings[i];
+      const subbindings = gatherSubbindings(binding);
+      if (subbindings.length) {
+        simplifyBindingProperties(binding);
+        simplifyBindingProperties(subbindings);
+        spliceChild(declaration, binding, 1, binding, subbindings);
+      }
+    }
+    for (let i3 = 0, len22 = bindings.length; i3 < len22; i3++) {
+      const binding = bindings[i3];
       let { typeSuffix, initializer } = binding;
       if (typeSuffix && typeSuffix.optional) {
         if (initializer && !typeSuffix.t) {
@@ -5074,6 +5339,25 @@ function processDeclarations(statements) {
       }
     }
   }
+  for (let ref2 = gatherRecursiveAll(statements, ($1) => $1.type === "ForStatement"), i4 = 0, len3 = ref2.length; i4 < len3; i4++) {
+    const statement = ref2[i4];
+    const { declaration } = statement;
+    if (!(declaration?.type === "ForDeclaration")) {
+      continue;
+    }
+    const { binding } = declaration;
+    const blockPrefix = getPatternBlockPrefix(
+      binding.pattern,
+      void 0,
+      append(declaration.decl, " "),
+      binding.typeSuffix
+    );
+    simplifyBindingProperties(binding);
+    if (blockPrefix != null) {
+      statement.block.expressions.unshift(...blockPrefix);
+      braceBlock(statement.block);
+    }
+  }
 }
 function prependStatementExpressionBlock(initializer, statement) {
   let { expression: exp } = initializer;
@@ -5082,7 +5366,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 = [];
@@ -5217,8 +5501,7 @@ function processDeclarationConditionStatement(s) {
   }
   let { expression } = condition;
   if (expression && typeof expression === "object" && "type" in expression && expression.type === "UnaryExpression" && "children" in expression && Array.isArray(expression.children) && len2(expression.children, 2) && Array.isArray(expression.children[0]) && len2(expression.children[0], 1) && expression.children[0][0] === "!" && typeof expression.children[1] === "object" && expression.children[1] != null && "type" in expression.children[1] && expression.children[1].type === "ParenthesizedExpression" && "expression" in expression.children[1]) {
-    const { type: type1, children: [[], { type: type2, expression: expression2 }] } = expression;
-    const type = [type1, type2];
+    const { children: [[], { expression: expression2 }] } = expression;
     expression = expression2;
   }
   processDeclarationCondition(expression, condition.expression, s);
@@ -5243,8 +5526,8 @@ function processDeclarationConditionStatement(s) {
         ({ children } = condition.expression.children[1]);
       }
       children.unshift("(");
-      for (let i3 = 0, len3 = conditions.length; i3 < len3; i3++) {
-        const c = conditions[i3];
+      for (let i5 = 0, len4 = conditions.length; i5 < len4; i5++) {
+        const c = conditions[i5];
         children.push(" && ", c);
       }
       children.push(")");
@@ -5266,11 +5549,11 @@ function processDeclarationConditionStatement(s) {
     ancestor.expressions.splice(index + 1, 0, ...blockPrefix);
     updateParentPointers(ancestor);
     braceBlock(ancestor);
-    let ref2;
+    let ref3;
     switch (s.type) {
       case "IfStatement": {
-        if (ref2 = s.else?.block) {
-          const elseBlock = ref2;
+        if (ref3 = s.else?.block) {
+          const elseBlock = ref3;
           if (elseBlock.bare && !elseBlock.semicolon) {
             elseBlock.children.push(elseBlock.semicolon = ";");
           }
@@ -5294,13 +5577,13 @@ function processDeclarationConditionStatement(s) {
       if (s.negated) {
         if (e != null) {
           const block = blockWithPrefix(blockPrefix, e.block);
-          e.children = e.children.map(($1) => $1 === e.block ? block : $1);
+          e.children = e.children.map(($2) => $2 === e.block ? block : $2);
           e.block = block;
           updateParentPointers(e);
         }
       } else {
         const block = blockWithPrefix(blockPrefix, s.then);
-        s.children = s.children.map(($2) => $2 === s.then ? block : $2);
+        s.children = s.children.map(($3) => $3 === s.then ? block : $3);
         s.then = block;
         updateParentPointers(s);
       }
@@ -5313,7 +5596,7 @@ function processDeclarationConditionStatement(s) {
       }
       const { children, block } = s;
       const newBlock = blockWithPrefix(blockPrefix, block);
-      s.children = children.map(($3) => $3 === block ? newBlock : $3);
+      s.children = children.map(($4) => $4 === block ? newBlock : $4);
       updateParentPointers(s);
       break;
     }
@@ -5341,7 +5624,7 @@ function processDeclarationConditionStatement(s) {
         const block = makeEmptyBlock();
         replaceBlockExpression(s.parent, s, block);
         block.expressions.push(["", s]);
-        s.children.splice(s.children.findIndex(($4) => $4.token === "switch"), 0, blockPrefix);
+        s.children.splice(s.children.findIndex(($5) => $5.token === "switch"), 0, blockPrefix);
         s.parent = block;
       } else {
         const block = blockWithPrefix([["", [{
@@ -5361,12 +5644,12 @@ function processDeclarationConditionStatement(s) {
 function dynamizeFromClause(from) {
   from = from.slice(1);
   from = trimFirstSpace(from);
-  let ref3;
-  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);
+  let ref4;
+  if (ref4 = from[from.length - 1]?.assertion) {
+    const assert2 = ref4;
+    let ref5;
+    ref5 = from[from.length - 1];
+    ref5.children = ref5.children.filter((a2) => a2 !== assert2);
     from.push(", {", assert2.keyword, ":", assert2.object, "}");
   }
   return ["(", ...from, ")"];
@@ -5375,20 +5658,20 @@ function dynamizeImportDeclaration(decl) {
   const { imports } = decl;
   let { star, binding, specifiers } = imports;
   const justDefault = binding && !specifiers && !star;
-  let ref5;
+  let ref6;
   {
     if (binding) {
       if (specifiers) {
-        ref5 = makeRef();
+        ref6 = makeRef();
       } else {
-        ref5 = binding;
+        ref6 = binding;
       }
     } else {
-      ref5 = convertNamedImportsToObject(imports, true);
+      ref6 = convertNamedImportsToObject(imports, true);
     }
   }
   ;
-  const pattern = ref5;
+  const pattern = ref6;
   const c = "const";
   const expression = [
     justDefault ? "(" : void 0,
@@ -5653,7 +5936,7 @@ function processUnaryNestedExpression(pre, args, post) {
           children: args.children.map(
             (arg) => {
               if (typeof arg === "object" && arg != null && "type" in arg && arg.type === "ArrayElement" && "expression" in arg && "children" in arg) {
-                const { type, expression: exp, children } = arg;
+                const { expression: exp, children } = arg;
                 let expression = processUnaryExpression([last], trimFirstSpace(exp));
                 expression = prepend(getTrimmingSpace(exp), expression);
                 return {
@@ -5899,12 +6182,12 @@ function processPipelineExpressions(statements) {
 }
 
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
-function processRangeExpression(start, ws1, range, end) {
-  ws1 = [ws1, range.children[0]];
-  const ws2 = range.children[1];
-  const comma = { $loc: range.$loc, token: "," };
+function processRangeExpression(start, ws1, range2, end) {
+  ws1 = [ws1, range2.children[0]];
+  const ws2 = range2.children[1];
+  const comma = { $loc: range2.$loc, token: "," };
   let ref;
-  switch (range.increasing) {
+  switch (range2.increasing) {
     case true: {
       ref = ($) => $;
       break;
@@ -5919,15 +6202,7 @@ 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;
+  const lengthAdjust = 1 - Number(!range2.left.inclusive) - Number(!range2.right.inclusive);
   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);
@@ -5940,7 +6215,7 @@ function processRangeExpression(start, ws1, range, end) {
       let endCode = endValue.charCodeAt(0);
       const step = startCode <= endCode ? 1 : -1;
       const length = abs(endCode - startCode) + lengthAdjust;
-      if (!range.left.inclusive) {
+      if (!range2.left.inclusive) {
         startCode += step;
       }
       if (length <= 26) {
@@ -5953,20 +6228,21 @@ 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) {
-        children.unshift(range.error);
+      if (range2.error != null) {
+        children.unshift(range2.error);
       }
     } else if (typeof startValue === "number" && typeof endValue === "number") {
       const step = startValue <= endValue ? 1 : -1;
       const length = abs(endValue - startValue) + lengthAdjust;
-      if (!range.left.inclusive) {
+      if (!range2.left.inclusive) {
         startValue += step;
       }
       if (length <= 20) {
@@ -5975,33 +6251,36 @@ function processRangeExpression(start, ws1, range, end) {
           Array.from({ length }, (_2, i) => startValue + i * step).join(", "),
           "]"
         ];
-        if (range.error != null) {
-          children.unshift(range.error);
+        if (range2.error != null) {
+          children.unshift(range2.error);
         }
       }
     }
   }
   if (!(children != null)) {
-    if (range.increasing != null) {
-      const sign = range.increasing ? "+" : "-";
+    if (range2.increasing != null) {
+      const sign = range2.increasing ? "+" : "-";
       end = makeLeftHandSideExpression(end);
       children = [
-        "((s) => Array.from({length: ",
-        range.increasing ? [ws2, end, " - s"] : ["s - ", ws2, end],
-        lengthAdjustExpression,
-        "}, (_, i) => s ",
-        sign,
-        " i))",
+        getHelperRef(range2.increasing ? "range" : "revRange"),
         "(",
-        range.left.inclusive ? start : [makeLeftHandSideExpression(start), ` ${sign} 1`],
+        range2.left.inclusive ? start : [makeLeftHandSideExpression(start), ` ${sign} 1`],
+        ",",
+        range2.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",
+        range2.right.inclusive ? " - 1" : void 0,
+        ") : ",
+        getHelperRef("range"),
+        "(s, e",
+        range2.right.inclusive ? " + 1" : void 0,
+        "))",
         "(",
         start,
         ...ws1,
@@ -6017,14 +6296,14 @@ function processRangeExpression(start, ws1, range, end) {
     children,
     start,
     end,
-    error: range.error,
-    left: range.left,
-    right: range.right,
-    increasing: range.increasing
+    error: range2.error,
+    left: range2.left,
+    right: range2.right,
+    increasing: range2.increasing
   };
 }
-function forRange(open, forDeclaration, range, stepExp, close) {
-  let { start, end, left, right, increasing } = range;
+function forRange(open, forDeclaration, range2, stepExp, close) {
+  let { start, end, left, right, increasing } = range2;
   const counterRef = makeRef("i");
   const infinite = typeof end === "object" && end != null && "type" in end && end.type === "Identifier" && "name" in end && end.name === "Infinity";
   let stepRef, asc;
@@ -6042,25 +6321,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, ", "] : [];
@@ -6072,8 +6351,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",
@@ -6123,14 +6402,14 @@ function forRange(open, forDeclaration, range, stepExp, close) {
     // This declaration doesn't always appear in the output,
     // but it's still helpful for determining the primary loop variable
     declaration: forDeclaration,
-    children: [range.error, open, declaration, "; ", ...condition, "; ", ...increment, close],
+    children: [range2.error, open, declaration, "; ", ...condition, "; ", ...increment, close],
     blockPrefix
   };
 }
 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;
     }
@@ -6179,14 +6458,16 @@ function processForInOf($0) {
         names: assignmentNames,
         implicitLift: true
       }, ";"]);
+      const eachDeclaration = declaration;
       declaration = {
         type: "Declaration",
         children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", trimFirstSpace(expRef2), ".length"],
+        decl: "let",
         names: []
       };
       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",
@@ -6205,6 +6486,9 @@ function processForInOf($0) {
   }
   const { binding } = declaration;
   let pattern = binding?.pattern;
+  if (pattern?.type === "NamedBindingPattern") {
+    pattern = pattern.binding;
+  }
   if (binding?.typeSuffix || inOf.token === "in" && declaration2 && pattern.type !== "Identifier") {
     const itemRef = makeRef(inOf.token === "in" ? "key" : "item");
     blockPrefix.push(["", {
@@ -6243,12 +6527,14 @@ function processForInOf($0) {
       hoistDec = {
         type: "Declaration",
         children: ["let ", counterRef, " = 0"],
+        decl: "let",
         names: []
       };
       blockPrefix.push(["", {
         type: "Declaration",
         children: [trimFirstSpace(ws2), decl2, " = ", counterRef, "++"],
-        names: decl2.names
+        names: decl2.names,
+        decl: decl2.decl
       }, ";"]);
       break;
     }
@@ -6258,7 +6544,8 @@ function processForInOf($0) {
         hoistDec = {
           type: "Declaration",
           children: ["let ", expRef2],
-          names: []
+          names: [],
+          decl: "let"
         };
         exp = {
           type: "AssignmentExpression",
@@ -6270,20 +6557,58 @@ function processForInOf($0) {
         blockPrefix.push(["", ["if (!", hasPropRef, "(", trimFirstSpace(expRef2), ", ", trimFirstSpace(pattern), ")) continue"], ";"]);
       }
       if (decl2) {
-        blockPrefix.push(["", {
-          type: "Declaration",
+        const trimmedPattern = trimFirstSpace(pattern);
+        const expression = makeNode({
+          type: "MemberExpression",
           children: [
-            trimFirstSpace(ws2),
-            decl2,
-            " = ",
             trimFirstSpace(expRef2),
-            "[",
-            trimFirstSpace(pattern),
-            "]"
-          ],
-          decl: decl2,
-          names: decl2.names
-        }, ";"]);
+            makeNode({
+              type: "Index",
+              expression: trimmedPattern,
+              children: ["[", trimmedPattern, "]"]
+            })
+          ]
+        });
+        blockPrefix.push([
+          "",
+          (() => {
+            if (decl2.type === "ForDeclaration") {
+              const { binding: binding2, children } = decl2;
+              binding2.children.push(binding2.initializer = makeNode({
+                type: "Initializer",
+                expression,
+                children: [" = ", expression]
+              }));
+              return makeNode({
+                type: "Declaration",
+                children: [
+                  trimFirstSpace(ws2),
+                  ...children
+                ],
+                bindings: [decl2.binding],
+                decl: decl2.decl,
+                names: decl2.names
+              });
+            } else {
+              return makeNode({
+                type: "AssignmentExpression",
+                children: [
+                  trimFirstSpace(ws2),
+                  decl2,
+                  " = ",
+                  trimFirstSpace(expRef2),
+                  "[",
+                  trimFirstSpace(pattern),
+                  "]"
+                ],
+                names: decl2.names,
+                lhs: decl2,
+                assigned: decl2
+              });
+            }
+          })(),
+          ";"
+        ]);
       }
       ;
       break;
@@ -6813,7 +7138,7 @@ function processTryBlock($0) {
     const clauses = cs.map((clause) => {
       let ref1;
       if ((ref1 = clause.binding?.parameter) && typeof ref1 === "object" && "type" in ref1 && ref1.type === "CatchPattern" && "patterns" in ref1) {
-        const { type, patterns } = ref1;
+        const { patterns } = ref1;
         return {
           type: "PatternClause",
           patterns,
@@ -7417,7 +7742,14 @@ function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "g
 function processBindingPatternLHS(lhs, tail) {
   adjustAtBindings(lhs, true);
   const [splices, thisAssignments] = gatherBindingCode(lhs);
-  tail.push(...splices.map((s) => [", ", s]), ...thisAssignments.map((a) => [", ", a]));
+  const subbindings = gatherSubbindings(lhs);
+  simplifyBindingProperties(lhs);
+  simplifyBindingProperties(subbindings);
+  tail.push(
+    ...splices.map((s) => [", ", s]),
+    ...thisAssignments.map((a) => [", ", a]),
+    ...subbindings
+  );
 }
 function processAssignments(statements) {
   for (let ref7 = gatherRecursiveAll(statements, ($4) => $4.type === "AssignmentExpression" || $4.type === "UpdateExpression"), i5 = 0, len3 = ref7.length; i5 < len3; i5++) {
@@ -7502,7 +7834,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(
@@ -7586,7 +7918,7 @@ function processAssignments(statements) {
             message: "Slice range cannot be decreasing in assignment"
           });
           break;
-        } else if (m3 = lhs.type, m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern") {
+        } else if (m3 = lhs.type, m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern" || m3 === "NamedBindingPattern") {
           processBindingPatternLHS(lhs, tail);
           gatherRecursiveAll(lhs, ($9) => $9.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
         }
@@ -7735,7 +8067,7 @@ function processTypes(node) {
     while (suffixIndex >= 0) {
       const suffix = unary.suffix[suffixIndex];
       if (typeof suffix === "object" && suffix != null && "token" in suffix && suffix.token === "?") {
-        const { token } = suffix;
+        const {} = suffix;
         let count = 0;
         let m4;
         while (m4 = unary.suffix[suffixIndex], typeof m4 === "object" && m4 != null && "token" in m4 && m4.token === "?") {
@@ -7793,7 +8125,7 @@ function processTypes(node) {
         }
         results2.push(replaceNode(unary, replace, parent));
       } else if (typeof suffix === "object" && suffix != null && "type" in suffix && suffix.type === "NonNullAssertion") {
-        const { type } = suffix;
+        const {} = suffix;
         let m6;
         while (m6 = unary.suffix[suffixIndex], typeof m6 === "object" && m6 != null && "type" in m6 && m6.type === "NonNullAssertion") {
           unary.suffix.splice(suffixIndex--, 1);
@@ -8098,15 +8430,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(($16) => $16 === root.expressions ? newExpressions : $16);
-    root.expressions = newExpressions;
-  }
   addParentPointers(root);
-  const { expressions: statements } = root;
+  let { expressions: statements } = root;
   processPlaceholders(statements);
   processNegativeIndexAccess(statements);
   processTypes(statements);
@@ -8119,12 +8444,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);
   if (config2.coffeeClasses) {
     processCoffeeClasses(statements);
   }
-  statements.unshift(...state2.prelude);
+  statements.unshift(...extractPreludeFor(statements));
   if (config2.autoLet) {
     createConstLetDecs(statements, [], "let");
   } else if (config2.autoConst) {
@@ -8185,30 +8523,10 @@ function processRepl(root, rootIIFE) {
     }
   }
 }
-function populateRefs(statements) {
-  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 || []));
-    refNodes.forEach((ref) => {
-      const { type, base } = ref;
-      if (type !== "Ref") return;
-      ref.type = "Identifier";
-      let n = 0;
-      let name = base;
-      while (names.has(name)) {
-        n++;
-        name = `${base}${n}`;
-      }
-      names.add(name);
-      return ref.children = ref.names = [name];
-    });
-  }
-}
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  for (let ref25 = gatherRecursiveAll(statements, ($22) => $22.type === "Placeholder"), i17 = 0, len14 = ref25.length; i17 < len14; i17++) {
+  for (let ref25 = gatherRecursiveAll(statements, ($21) => $21.type === "Placeholder"), i17 = 0, len14 = ref25.length; i17 < len14; i17++) {
     const exp = ref25[i17];
     let ancestor;
     if (exp.subtype === ".") {
@@ -8505,6 +8823,8 @@ var grammar = {
   ExpressionizedStatement,
   StatementExpression,
   CommaExpression,
+  CommaExpressionSpread,
+  AssignmentExpressionSpread,
   Arguments,
   ImplicitArguments,
   ExplicitArguments,
@@ -8649,6 +8969,7 @@ var grammar = {
   NWBindingIdentifier,
   AtIdentifierRef,
   PinPattern,
+  NamedBindingPattern,
   BindingPattern,
   ObjectBindingPattern,
   ObjectBindingPatternContent,
@@ -8684,6 +9005,7 @@ var grammar = {
   BareNestedBlock,
   BareBlock,
   ThenClause,
+  ThenBlock,
   BracedThenClause,
   BracedOrEmptyBlock,
   NoCommaBracedOrEmptyBlock,
@@ -8793,6 +9115,7 @@ var grammar = {
   PostfixStatement,
   _PostfixStatement,
   Statement,
+  IterationActualStatement,
   ShouldExpressionize,
   NoCommaStatement,
   EmptyStatement,
@@ -9448,130 +9771,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"));
@@ -9687,8 +10012,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;
@@ -9815,6 +10139,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;
@@ -11130,8 +11519,9 @@ var LeftHandSideExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, impo
     expression
   };
 });
-var LeftHandSideExpression$1 = CallExpression;
-var LeftHandSideExpression$$ = [LeftHandSideExpression$0, LeftHandSideExpression$1];
+var LeftHandSideExpression$1 = NamedBindingPattern;
+var LeftHandSideExpression$2 = CallExpression;
+var LeftHandSideExpression$$ = [LeftHandSideExpression$0, LeftHandSideExpression$1, LeftHandSideExpression$2];
 function LeftHandSideExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "LeftHandSideExpression", LeftHandSideExpression$$);
 }
@@ -11754,7 +12144,7 @@ var FunctionRestParameter$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, impor
 function FunctionRestParameter(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "FunctionRestParameter", FunctionRestParameter$0);
 }
-var ParameterElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)(_), (0, import_lib2.$C)(NWBindingIdentifier, BindingPattern), (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer), ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+var ParameterElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingPattern, NWBindingIdentifier), (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer), ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
   var accessModifier = $2;
   var binding = $4;
   var typeSuffix = $5;
@@ -11867,12 +12257,31 @@ var PinPattern$$ = [PinPattern$0, PinPattern$1, PinPattern$2, PinPattern$3];
 function PinPattern(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PinPattern", PinPattern$$);
 }
+var NamedBindingPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(BindingIdentifier, Caret, (0, import_lib2.$E)(_), BindingPattern), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var binding = $1;
+  var ws = $3;
+  var pattern = $4;
+  pattern = prepend(ws, pattern);
+  return {
+    type: "NamedBindingPattern",
+    // NOTE: children just has binding, not pattern, for easy destructuring
+    children: [binding],
+    binding,
+    pattern,
+    subbinding: [pattern, " = ", binding],
+    typeSuffix: pattern.typeSuffix
+  };
+});
+function NamedBindingPattern(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "NamedBindingPattern", NamedBindingPattern$0);
+}
 var BindingPattern$0 = ObjectBindingPattern;
 var BindingPattern$1 = ArrayBindingPattern;
 var BindingPattern$2 = PinPattern;
 var BindingPattern$3 = Literal;
 var BindingPattern$4 = RegularExpressionLiteral;
-var BindingPattern$$ = [BindingPattern$0, BindingPattern$1, BindingPattern$2, BindingPattern$3, BindingPattern$4];
+var BindingPattern$5 = NamedBindingPattern;
+var BindingPattern$$ = [BindingPattern$0, BindingPattern$1, BindingPattern$2, BindingPattern$3, BindingPattern$4, BindingPattern$5];
 function BindingPattern(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "BindingPattern", BindingPattern$$);
 }
@@ -11996,14 +12405,32 @@ 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)(BindingPattern, BindingIdentifier), (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;
+  if (bind) {
+    const binding = name, pattern = value;
+    value = {
+      type: "NamedBindingPattern",
+      // NOTE: children just has binding, not pattern, for easy destructuring
+      children: [binding],
+      binding,
+      pattern,
+      subbinding: [pattern, " = ", binding],
+      typeSuffix: pattern.typeSuffix,
+      names: value.names
+    };
+  }
   return {
     type: "BindingProperty",
-    children: [$1, name, $3, $4, $5, value, initializer],
+    children: [ws1, name, ws2, colon, ws3, value, initializer],
     // omit typeSuffix
     name,
     value,
@@ -12012,13 +12439,49 @@ var BindingProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
     names: value.names
   };
 });
-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",
@@ -12030,31 +12493,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",
-        children: [binding],
-        expression: binding
-      }
-    };
-  }
   return {
     type: "BindingProperty",
     children,
@@ -12066,7 +12504,7 @@ var BindingProperty$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
     identifier: binding
   };
 });
-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$$);
 }
@@ -12121,7 +12559,7 @@ function NestedBindingElements(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedBindingElements", NestedBindingElements$0);
 }
 var BindingElement$0 = BindingRestElement;
-var BindingElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((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) {
+var BindingElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingPattern, BindingIdentifier), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws = $1;
   var binding = $2;
   var typeSuffix = $3;
@@ -12146,7 +12584,7 @@ var BindingElement$$ = [BindingElement$0, BindingElement$1, BindingElement$2];
 function BindingElement(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "BindingElement", BindingElement$$);
 }
-var BindingRestElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, (0, import_lib2.$C)(BindingIdentifier, BindingPattern, EmptyBindingPattern), (0, import_lib2.$E)(BindingTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4) {
+var BindingRestElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, (0, import_lib2.$C)(BindingPattern, BindingIdentifier, EmptyBindingPattern), (0, import_lib2.$E)(BindingTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws = $1;
   var dots = $2;
   var binding = $3;
@@ -12162,7 +12600,7 @@ var BindingRestElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_l
     rest: true
   };
 });
-var BindingRestElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingIdentifier, BindingPattern), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
+var BindingRestElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingPattern, BindingIdentifier), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
   var ws = $1;
   var binding = $2;
   var dots = $3;
@@ -12632,12 +13070,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;
@@ -13162,9 +13609,9 @@ function RangeEnd(ctx, state2) {
 var RangeExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Expression, __, RangeDots, Expression), function($skip, $loc, $0, $1, $2, $3, $4) {
   var start = $1;
   var ws = $2;
-  var range = $3;
+  var range2 = $3;
   var end = $4;
-  return processRangeExpression(start, ws, range, end);
+  return processRangeExpression(start, ws, range2, end);
 });
 var RangeExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Expression, __, DotDot, (0, import_lib2.$Y)((0, import_lib2.$S)(__, CloseBracket))), function($skip, $loc, $0, $1, $2, $3, $4) {
   var s = $1;
@@ -14649,11 +15096,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];
 });
@@ -14669,6 +15112,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;
@@ -14771,12 +15222,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);
@@ -15020,15 +15471,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
   };
 });
@@ -15074,7 +15528,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 {
@@ -15295,10 +15749,13 @@ var ForDeclaration$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(LetOrConstOrVar,
 var ForDeclaration$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertConst, (0, import_lib2.$N)(ActualMemberExpression), ForBinding), function($skip, $loc, $0, $1, $2, $3) {
   var c = $1;
   var binding = $3;
+  if (gatherRecursive(binding, ($) => $.type === "PinPattern").length) {
+    return $skip;
+  }
   return {
     type: "ForDeclaration",
     children: [c, binding],
-    decl: c.token,
+    decl: c.token.trimEnd(),
     binding,
     names: binding.names
   };
@@ -15468,12 +15925,17 @@ function PatternExpressionList(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "PatternExpressionList", PatternExpressionList$0);
 }
 var PatternExpression$0 = BindingPattern;
-var PatternExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(ForbidIndentedApplication, (0, import_lib2.$E)((0, import_lib2.$P)(SingleLineBinaryOpRHS)), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
-  var pattern = $2;
-  if (!pattern) return $skip;
+var PatternExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(ForbidIndentedApplication, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(BindingIdentifier, (0, import_lib2.$E)(Caret))), (0, import_lib2.$P)(SingleLineBinaryOpRHS))), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
+  var body = $2;
+  if (!body) return $skip;
+  const [named, rhs] = body;
+  let binding;
+  if (named) [binding] = named;
   return {
     type: "ConditionFragment",
-    children: pattern
+    children: [binding, rhs],
+    binding,
+    rhs
   };
 });
 var PatternExpression$$ = [PatternExpression$0, PatternExpression$1];
@@ -15585,31 +16047,31 @@ var FinallyClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Finally, (0, impo
 function FinallyClause(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "FinallyClause", FinallyClause$0);
 }
-var CatchParameter$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(BindingIdentifier, (0, import_lib2.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
+var CatchParameter$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)(ObjectBindingPattern, ArrayBindingPattern), TypeSuffix), function($skip, $loc, $0, $1, $2) {
   var binding = $1;
   var typeSuffix = $2;
   return {
     type: "CatchParameter",
     binding,
     typeSuffix,
-    children: $0
+    children: [binding, typeSuffix]
+  };
+});
+var CatchParameter$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PatternExpressionList), function($skip, $loc, $0, $1) {
+  return {
+    type: "CatchPattern",
+    children: $0,
+    patterns: $1
   };
 });
-var CatchParameter$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)(ObjectBindingPattern, ArrayBindingPattern), TypeSuffix), function($skip, $loc, $0, $1, $2) {
+var CatchParameter$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(BindingIdentifier, (0, import_lib2.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
   var binding = $1;
   var typeSuffix = $2;
   return {
     type: "CatchParameter",
     binding,
     typeSuffix,
-    children: [binding, typeSuffix]
-  };
-});
-var CatchParameter$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PatternExpressionList), function($skip, $loc, $0, $1) {
-  return {
-    type: "CatchPattern",
-    children: $0,
-    patterns: $1
+    children: $0
   };
 });
 var CatchParameter$$ = [CatchParameter$0, CatchParameter$1, CatchParameter$2];
@@ -15923,7 +16385,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) {
@@ -15997,19 +16459,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) {
@@ -16086,7 +16548,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 }
@@ -16274,7 +16736,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 {
@@ -16595,19 +17057,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) {
@@ -17051,7 +17513,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) {
@@ -17097,7 +17559,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];
@@ -17148,7 +17610,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);
 }
@@ -17171,7 +17633,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) {
@@ -17183,67 +17645,67 @@ 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) {
   return (0, import_lib2.$EVENT)(ctx, state2, "By", By$0);
 }
-var Caret$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'), function($skip, $loc, $0, $1) {
+var Caret$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'))), function($skip, $loc, $0, $1, $2) {
   return { $loc, token: $1 };
 });
 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) {
@@ -17267,13 +17729,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) {
@@ -17291,37 +17753,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) {
@@ -17341,20 +17803,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];
@@ -17367,31 +17829,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) {
@@ -17403,61 +17865,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) {
@@ -17469,67 +17931,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) {
@@ -17547,7 +18009,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) {
@@ -17559,49 +18021,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];
@@ -17614,19 +18076,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) {
@@ -17638,7 +18100,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) {
@@ -17650,149 +18112,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) {
@@ -17869,7 +18331,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) {
@@ -17902,7 +18364,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);
 }
@@ -17922,7 +18384,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 {
@@ -17935,7 +18397,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;
 });
@@ -17951,11 +18413,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)))));
@@ -18132,7 +18594,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) {
@@ -18468,7 +18930,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) {
@@ -18752,37 +19214,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) {
@@ -19091,7 +19553,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;
@@ -19184,8 +19646,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$$);
@@ -19215,7 +19677,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) {
@@ -19592,13 +20054,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];
@@ -19617,7 +20079,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) {
@@ -19857,7 +20319,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",
@@ -20566,7 +21028,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;
@@ -20581,96 +21043,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) {
@@ -20681,8 +21155,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))}`;
@@ -20744,10 +21218,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;
@@ -20919,8 +21393,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();
@@ -20947,8 +21421,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) {
@@ -21132,7 +21630,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) {
@@ -21147,7 +21645,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();
     }