@danielx/civet 0.6.20 → 0.6.22

package/dist/browser.js

@@ -49,6 +49,25 @@ var Civet = (() => {
           }
         }
       }
+      function updateParentPointers(node, parent, depth = 1) {
+        if (node == null)
+          return;
+        if (typeof node !== "object")
+          return;
+        if (Array.isArray(node)) {
+          for (const child of node) {
+            updateParentPointers(child, parent, depth);
+          }
+          return;
+        }
+        if (parent != null)
+          node.parent = parent;
+        if (depth && node.children) {
+          for (const child of node.children) {
+            updateParentPointers(child, node, depth - 1);
+          }
+        }
+      }
       function addPostfixStatement(statement, ws, post) {
         let children, expressions;
         if (post.blockPrefix?.length) {
@@ -338,29 +357,26 @@ var Civet = (() => {
         };
       }
       function expressionizeIteration(exp) {
-        const i = exp.children.indexOf(exp.block);
-        if (exp.subtype === "DoStatement") {
-          insertReturn(exp.block);
-          exp.children.splice(i, 1, ...wrapIIFE(exp.children, exp.async));
+        const { async, subtype, block, children, statement } = exp;
+        const i = children.indexOf(statement);
+        if (i < 0) {
+          throw new Error("Could not find iteration statement in iteration expression");
+        }
+        if (subtype === "DoStatement") {
+          insertReturn(block);
+          children.splice(i, 1, ...wrapIIFE(statement, async));
           return;
         }
-        const resultsRef = {
-          type: "Ref",
-          base: "results",
-          id: "results"
-        };
-        insertPush(exp.block, resultsRef);
-        exp.children.splice(
+        const resultsRef = makeRef("results");
+        insertPush(block, resultsRef);
+        children.splice(
           i,
           1,
-          wrapIIFE([
-            "const ",
-            resultsRef,
-            "=[];",
-            ...exp.children,
-            "; return ",
-            resultsRef
-          ], exp.async)
+          ...wrapIIFE([
+            ["", ["const ", resultsRef, "=[]"], ";"],
+            ...children,
+            ["", ["; return ", resultsRef]]
+          ], async)
         );
       }
       function processBinaryOpExpression($0) {
@@ -426,10 +442,7 @@ var Civet = (() => {
             const parts = [];
             let hoistDec, refAssignment;
             if (prefix.length > 1) {
-              const ref = {
-                type: "Ref",
-                base: "ref"
-              };
+              const ref = makeRef();
               hoistDec = {
                 type: "Declaration",
                 children: ["let ", ref],
@@ -531,11 +544,7 @@ var Civet = (() => {
           }
           return;
         }
-        const resultsRef = {
-          type: "Ref",
-          base: "results",
-          id: "results"
-        };
+        const resultsRef = makeRef("results");
         const declaration = {
           type: "Declaration",
           children: ["const ", resultsRef, "=[];"]
@@ -697,6 +706,7 @@ var Civet = (() => {
       }
       function processParams(f) {
         const { type, parameters, block } = f;
+        const isConstructor = f.name === "constructor";
         if (type === "ArrowFunction" && parameters && parameters.tp && parameters.tp.parameters.length === 1) {
           parameters.tp.parameters.push(",");
         }
@@ -713,7 +723,7 @@ var Civet = (() => {
           indent = expressions[0][0];
         }
         const [splices, thisAssignments] = gatherBindingCode(parameters, {
-          injectParamProps: f.name === "constructor"
+          injectParamProps: isConstructor
         });
         const delimiter = {
           type: "SemicolonDelimiter",
@@ -725,6 +735,23 @@ var Civet = (() => {
             children: [indent, ...s.children, delimiter]
           } : [indent, s, delimiter]
         );
+        if (!prefix.length)
+          return;
+        if (isConstructor) {
+          const superCalls = gatherNodes(expressions, (exp) => exp.type === "CallExpression" && exp.children[0]?.token === "super");
+          if (superCalls.length) {
+            const { child } = findAncestor(
+              superCalls[0],
+              (ancestor) => ancestor === block
+            );
+            const index = findChildIndex(expressions, child);
+            if (index < 0) {
+              throw new Error("Could not find super call within top-level expressions");
+            }
+            expressions.splice(index + 1, 0, ...prefix);
+            return;
+          }
+        }
         expressions.unshift(...prefix);
       }
       function removeParentPointers(node) {
@@ -745,6 +772,24 @@ var Civet = (() => {
           }
         }
       }
+      function findChildIndex(parent, child) {
+        const children = Array.isArray(parent) ? parent : parent.children;
+        const len = children.length;
+        for (let i = 0; i < len; i++) {
+          const c = children[i];
+          if (c === child || Array.isArray(c) && arrayRecurse(c))
+            return i;
+        }
+        function arrayRecurse(array) {
+          const len2 = array.length;
+          for (let i = 0; i < len2; i++) {
+            const c = array[i];
+            if (c === child || Array.isArray(c) && arrayRecurse(c))
+              return true;
+          }
+        }
+        return -1;
+      }
       function findAncestor(node, predicate, stopPredicate) {
         let { parent } = node;
         while (parent && !stopPredicate?.(parent, node)) {
@@ -840,11 +885,15 @@ var Civet = (() => {
       }
       function insertHoistDec(block, node, dec) {
         const { expressions } = block;
-        const index = expressions.findIndex(([, s]) => node === s);
+        const index = expressions.findIndex((exp) => exp === node || Array.isArray(exp) && exp[1] === node);
         if (index < 0)
           throw new Error("Couldn't find expression in block for hoistable declaration.");
-        const indent = expressions[index][0];
-        expressions.splice(index, 0, [indent, dec, ";"]);
+        if (expressions[index] === node) {
+          expressions.splice(index, 0, ["", dec, ";"]);
+        } else {
+          const indent = expressions[index][0];
+          expressions.splice(index, 0, [indent, dec, ";"]);
+        }
       }
       function patternAsValue(pattern) {
         switch (pattern.type) {
@@ -1040,13 +1089,123 @@ var Civet = (() => {
         if (target.token)
           return target.token.match(/^ ?/)[0];
       }
+      function processForInOf($0) {
+        let [awaits, each, open, declaration, declaration2, ws, inOf, exp, step, close] = $0;
+        if (exp.type === "RangeExpression" && inOf.token === "of" && !declaration2) {
+          return forRange(open, declaration, exp, step, close);
+        } else if (step) {
+          throw new Error("for..of/in cannot use 'by' except with range literals");
+        }
+        let eachError;
+        let hoistDec, blockPrefix = [];
+        if (each) {
+          if (inOf.token === "of") {
+            const counterRef = makeRef("i");
+            const lenRef = makeRef("len");
+            const expRef = maybeRef(exp);
+            const increment = "++";
+            let indexAssignment, assignmentNames = [...declaration.names];
+            if (declaration2) {
+              const [, , ws22, decl22] = declaration2;
+              blockPrefix.push(["", [
+                insertTrimmingSpace(ws22, ""),
+                decl22,
+                " = ",
+                counterRef
+              ], ";"]);
+              assignmentNames.push(...decl22.names);
+            }
+            const expRefDec = expRef !== exp ? [insertTrimmingSpace(expRef, " "), " = ", insertTrimmingSpace(exp, ""), ", "] : [];
+            blockPrefix.push(["", {
+              type: "AssignmentExpression",
+              children: [declaration, " = ", insertTrimmingSpace(expRef, ""), "[", counterRef, "]"],
+              names: assignmentNames
+            }, ";"]);
+            declaration = {
+              type: "Declaration",
+              children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", insertTrimmingSpace(expRef, ""), ".length"],
+              names: []
+            };
+            const condition = [counterRef, " < ", lenRef, "; "];
+            const children = [open, declaration, "; ", condition, counterRef, increment, close];
+            return { declaration, children, blockPrefix };
+          } else {
+            eachError = {
+              type: "Error",
+              message: "'each' is only meaningful in for..of loops"
+            };
+          }
+        }
+        if (!declaration2) {
+          return {
+            declaration,
+            children: [awaits, eachError, open, declaration, ws, inOf, exp, step, close]
+          };
+        }
+        const [, , ws2, decl2] = declaration2;
+        switch (inOf.token) {
+          case "of": {
+            const counterRef = makeRef("i");
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", counterRef, " = 0"],
+              names: []
+            };
+            blockPrefix.push(["", {
+              type: "Declaration",
+              children: [insertTrimmingSpace(ws2, ""), decl2, " = ", counterRef, "++"],
+              names: decl2.names
+            }, ";"]);
+            break;
+          }
+          case "in": {
+            const expRef = maybeRef(exp);
+            if (expRef !== exp) {
+              hoistDec = {
+                type: "Declaration",
+                children: ["let ", expRef],
+                names: []
+              };
+              exp = {
+                type: "AssignmentExpression",
+                children: [" ", expRef, " =", exp]
+              };
+            }
+            let { binding } = declaration;
+            if (binding?.type !== "Identifier") {
+              const keyRef = makeRef("key");
+              blockPrefix.push(["", [
+                declaration,
+                " = ",
+                keyRef
+              ], ";"]);
+              declaration = {
+                type: "ForDeclaration",
+                binding: binding = keyRef,
+                children: ["const ", keyRef],
+                names: []
+              };
+            }
+            blockPrefix.push(["", {
+              type: "Declaration",
+              children: [insertTrimmingSpace(ws2, ""), decl2, " = ", insertTrimmingSpace(expRef, ""), "[", insertTrimmingSpace(binding, ""), "]"],
+              names: decl2.names
+            }, ";"]);
+            break;
+          }
+          default:
+            throw new Error(`for item, index must use 'of' or 'in' instead of '${inOf.token}'`);
+        }
+        return {
+          declaration,
+          children: [awaits, eachError, open, declaration, ws, inOf, exp, step, close],
+          blockPrefix,
+          hoistDec
+        };
+      }
       function forRange(open, forDeclaration, range, stepExp, close) {
         const { start, end, inclusive } = range;
-        const counterRef = {
-          type: "Ref",
-          base: "i",
-          id: "i"
-        };
+        const counterRef = makeRef("i");
         let stepRef;
         if (stepExp) {
           stepExp = insertTrimmingSpace(stepExp, "");
@@ -1064,11 +1223,7 @@ var Civet = (() => {
         } else if (start.type === "Literal" && end.type === "Literal") {
           asc = literalValue(start) <= literalValue(end);
         } else {
-          ascRef = {
-            type: "Ref",
-            base: "asc",
-            id: "asc"
-          };
+          ascRef = makeRef("asc");
           ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
         }
         let varAssign = [], varLetAssign = varAssign, varLet = varAssign, blockPrefix;
@@ -1208,15 +1363,6 @@ var Civet = (() => {
             };
         }
       }
-      function maybeRef(exp, base = "ref") {
-        if (!needsRef(exp))
-          return exp;
-        return {
-          type: "Ref",
-          base,
-          id: base
-        };
-      }
       function modifyString(str) {
         return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
       }
@@ -1312,13 +1458,20 @@ var Civet = (() => {
           case "Identifier":
           case "Literal":
             return;
-          default:
-            return {
-              type: "Ref",
-              base,
-              id: base
-            };
         }
+        return makeRef(base);
+      }
+      function makeRef(base = "ref") {
+        return {
+          type: "Ref",
+          base,
+          id: base
+        };
+      }
+      function maybeRef(exp, base = "ref") {
+        if (!needsRef(exp))
+          return exp;
+        return makeRef(base);
       }
       function processCoffeeInterpolation(s, parts, e, $loc) {
         if (parts.length === 0 || parts.length === 1 && parts[0].token != null) {
@@ -1571,20 +1724,20 @@ var Civet = (() => {
         });
       }
       function attachPostfixStatementAsExpression(exp, post) {
-        let clause;
         switch (post[1].type) {
           case "ForStatement":
           case "IterationStatement":
-          case "DoStatement":
-            clause = addPostfixStatement(exp, ...post);
+          case "DoStatement": {
+            const statement = addPostfixStatement(exp, ...post);
             return {
               type: "IterationExpression",
-              children: [clause],
-              block: clause.block
+              children: [statement],
+              block: statement.block,
+              statement
             };
+          }
           case "IfStatement":
-            clause = expressionizeIfClause(post[1], exp);
-            return clause;
+            return expressionizeIfClause(post[1], exp);
           default:
             throw new Error("Unknown postfix statement");
         }
@@ -1811,11 +1964,7 @@ var Civet = (() => {
           if (shared.length === 1)
             return;
           const refs = shared.map((p) => {
-            const ref = {
-              type: "Ref",
-              base: key,
-              id: key
-            };
+            const ref = makeRef(key);
             aliasBinding(p, ref);
             return ref;
           });
@@ -1849,7 +1998,7 @@ var Civet = (() => {
           if (expression.type === "ParenthesizedExpression") {
             expression = expression.expression;
           }
-          let hoistDec, refAssignment = [], ref = needsRef(expression, "m") || expression;
+          let hoistDec, refAssignment = [], ref = maybeRef(expression, "m");
           if (ref !== expression) {
             hoistDec = {
               type: "Declaration",
@@ -1975,7 +2124,7 @@ var Civet = (() => {
                           arg.children.push(access);
                           break outer;
                       }
-                      usingRef = needsRef({});
+                      usingRef = makeRef();
                       initRef = {
                         type: "AssignmentExpression",
                         children: [usingRef, " = ", arg, ","]
@@ -2079,8 +2228,8 @@ var Civet = (() => {
         processFunctions(statements, config);
         processSwitchExpressions(statements);
         processTryExpressions(statements);
-        hoistRefDecs(statements);
         gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
+        hoistRefDecs(statements);
         statements.unshift(...m.prelude);
         if (config.autoLet) {
           createLetDecs(statements, []);
@@ -2250,11 +2399,7 @@ var Civet = (() => {
         );
         if (!values.length)
           return false;
-        const ref = {
-          type: "Ref",
-          base: "ret",
-          id: "ret"
-        };
+        const ref = makeRef("ret");
         let declared;
         values.forEach((value) => {
           value.children = [ref];
@@ -2527,13 +2672,14 @@ var Civet = (() => {
           prefix = "(()=>";
           suffix = ")()";
         }
-        const expressions = Array.isArray(exp) ? [[...exp]] : [exp];
+        const expressions = Array.isArray(exp) ? [...exp] : [exp];
         const block = {
           type: "BlockStatement",
           expressions,
           children: ["{", expressions, "}"],
           bare: false
         };
+        updateParentPointers(block);
         return [
           prefix,
           block,
@@ -2583,13 +2729,15 @@ var Civet = (() => {
         makeAsConst,
         makeEmptyBlock,
         makeLeftHandSideExpression,
+        makeRef,
         maybeRef,
         modifyString,
         needsRef,
+        processAssignmentDeclaration,
         processBinaryOpExpression,
         processCallMemberExpression,
         processCoffeeInterpolation,
-        processAssignmentDeclaration,
+        processForInOf,
         processParams,
         processProgram,
         processReturnValue,
@@ -3430,6 +3578,7 @@ ${input.slice(result.pos)}
         DotDotDot,
         DoubleColon,
         DoubleQuote,
+        Each,
         Else,
         Equals,
         Export,
@@ -3468,6 +3617,7 @@ ${input.slice(result.pos)}
         Star,
         Static,
         SubstitutionStart,
+        Super,
         Switch,
         Target,
         Then,
@@ -3674,128 +3824,128 @@ ${input.slice(result.pos)}
       var $L13 = $L("implements");
       var $L14 = $L("<:");
       var $L15 = $L("#");
-      var $L16 = $L("super");
-      var $L17 = $L("import");
-      var $L18 = $L("!");
-      var $L19 = $L("^");
-      var $L20 = $L("-");
-      var $L21 = $L("import.meta");
-      var $L22 = $L("return.value");
-      var $L23 = $L(",");
-      var $L24 = $L("->");
-      var $L25 = $L("\u2192");
-      var $L26 = $L("}");
-      var $L27 = $L("null");
-      var $L28 = $L("true");
-      var $L29 = $L("false");
-      var $L30 = $L("yes");
-      var $L31 = $L("on");
-      var $L32 = $L("no");
-      var $L33 = $L("off");
-      var $L34 = $L(">");
-      var $L35 = $L("]");
-      var $L36 = $L("**=");
-      var $L37 = $L("*=");
-      var $L38 = $L("/=");
-      var $L39 = $L("%=");
-      var $L40 = $L("+=");
-      var $L41 = $L("-=");
-      var $L42 = $L("<<=");
-      var $L43 = $L(">>>=");
-      var $L44 = $L(">>=");
-      var $L45 = $L("&&=");
-      var $L46 = $L("&=");
-      var $L47 = $L("^=");
-      var $L48 = $L("||=");
-      var $L49 = $L("|=");
-      var $L50 = $L("??=");
-      var $L51 = $L("?=");
-      var $L52 = $L("and=");
-      var $L53 = $L("or=");
-      var $L54 = $L("**");
-      var $L55 = $L("*");
-      var $L56 = $L("/");
-      var $L57 = $L("%%");
-      var $L58 = $L("%");
-      var $L59 = $L("+");
-      var $L60 = $L("<=");
-      var $L61 = $L("\u2264");
-      var $L62 = $L(">=");
-      var $L63 = $L("\u2265");
-      var $L64 = $L("<?");
-      var $L65 = $L("!<?");
-      var $L66 = $L("<<");
-      var $L67 = $L("\xAB");
-      var $L68 = $L(">>>");
-      var $L69 = $L("\u22D9");
-      var $L70 = $L(">>");
-      var $L71 = $L("\xBB");
-      var $L72 = $L("!==");
-      var $L73 = $L("\u2262");
-      var $L74 = $L("!=");
-      var $L75 = $L("\u2260");
-      var $L76 = $L("isnt");
-      var $L77 = $L("===");
-      var $L78 = $L("\u2263");
-      var $L79 = $L("\u2A76");
-      var $L80 = $L("==");
-      var $L81 = $L("\u2261");
-      var $L82 = $L("\u2A75");
-      var $L83 = $L("and");
-      var $L84 = $L("&&");
-      var $L85 = $L("of");
-      var $L86 = $L("or");
-      var $L87 = $L("||");
-      var $L88 = $L("\u2016");
-      var $L89 = $L("^^");
-      var $L90 = $L("xor");
-      var $L91 = $L("xnor");
-      var $L92 = $L("??");
-      var $L93 = $L("\u2047");
-      var $L94 = $L("instanceof");
-      var $L95 = $L("\u2208");
-      var $L96 = $L("\u220B");
-      var $L97 = $L("\u220C");
-      var $L98 = $L("\u2209");
-      var $L99 = $L("&");
-      var $L100 = $L("|");
-      var $L101 = $L(";");
-      var $L102 = $L("$:");
-      var $L103 = $L("own");
-      var $L104 = $L("break");
-      var $L105 = $L("continue");
-      var $L106 = $L("debugger");
-      var $L107 = $L("assert");
-      var $L108 = $L(":=");
-      var $L109 = $L("\u2254");
-      var $L110 = $L(".=");
-      var $L111 = $L("/*");
-      var $L112 = $L("*/");
-      var $L113 = $L("\\");
-      var $L114 = $L("[");
-      var $L115 = $L("`");
-      var $L116 = $L("abstract");
-      var $L117 = $L("as");
-      var $L118 = $L("@");
-      var $L119 = $L("@@");
-      var $L120 = $L("async");
-      var $L121 = $L("await");
-      var $L122 = $L("by");
-      var $L123 = $L("case");
-      var $L124 = $L("catch");
-      var $L125 = $L("class");
-      var $L126 = $L(")");
-      var $L127 = $L("#{");
-      var $L128 = $L("declare");
-      var $L129 = $L("default");
-      var $L130 = $L("delete");
-      var $L131 = $L("do");
-      var $L132 = $L("..");
-      var $L133 = $L("\u2025");
-      var $L134 = $L("...");
-      var $L135 = $L("\u2026");
-      var $L136 = $L("::");
-      var $L137 = $L('"');
+      var $L16 = $L("import");
+      var $L17 = $L("!");
+      var $L18 = $L("^");
+      var $L19 = $L("-");
+      var $L20 = $L("import.meta");
+      var $L21 = $L("return.value");
+      var $L22 = $L(",");
+      var $L23 = $L("->");
+      var $L24 = $L("\u2192");
+      var $L25 = $L("}");
+      var $L26 = $L("null");
+      var $L27 = $L("true");
+      var $L28 = $L("false");
+      var $L29 = $L("yes");
+      var $L30 = $L("on");
+      var $L31 = $L("no");
+      var $L32 = $L("off");
+      var $L33 = $L(">");
+      var $L34 = $L("]");
+      var $L35 = $L("**=");
+      var $L36 = $L("*=");
+      var $L37 = $L("/=");
+      var $L38 = $L("%=");
+      var $L39 = $L("+=");
+      var $L40 = $L("-=");
+      var $L41 = $L("<<=");
+      var $L42 = $L(">>>=");
+      var $L43 = $L(">>=");
+      var $L44 = $L("&&=");
+      var $L45 = $L("&=");
+      var $L46 = $L("^=");
+      var $L47 = $L("||=");
+      var $L48 = $L("|=");
+      var $L49 = $L("??=");
+      var $L50 = $L("?=");
+      var $L51 = $L("and=");
+      var $L52 = $L("or=");
+      var $L53 = $L("**");
+      var $L54 = $L("*");
+      var $L55 = $L("/");
+      var $L56 = $L("%%");
+      var $L57 = $L("%");
+      var $L58 = $L("+");
+      var $L59 = $L("<=");
+      var $L60 = $L("\u2264");
+      var $L61 = $L(">=");
+      var $L62 = $L("\u2265");
+      var $L63 = $L("<?");
+      var $L64 = $L("!<?");
+      var $L65 = $L("<<");
+      var $L66 = $L("\xAB");
+      var $L67 = $L(">>>");
+      var $L68 = $L("\u22D9");
+      var $L69 = $L(">>");
+      var $L70 = $L("\xBB");
+      var $L71 = $L("!==");
+      var $L72 = $L("\u2262");
+      var $L73 = $L("!=");
+      var $L74 = $L("\u2260");
+      var $L75 = $L("isnt");
+      var $L76 = $L("===");
+      var $L77 = $L("\u2263");
+      var $L78 = $L("\u2A76");
+      var $L79 = $L("==");
+      var $L80 = $L("\u2261");
+      var $L81 = $L("\u2A75");
+      var $L82 = $L("and");
+      var $L83 = $L("&&");
+      var $L84 = $L("of");
+      var $L85 = $L("or");
+      var $L86 = $L("||");
+      var $L87 = $L("\u2016");
+      var $L88 = $L("^^");
+      var $L89 = $L("xor");
+      var $L90 = $L("xnor");
+      var $L91 = $L("??");
+      var $L92 = $L("\u2047");
+      var $L93 = $L("instanceof");
+      var $L94 = $L("\u2208");
+      var $L95 = $L("\u220B");
+      var $L96 = $L("\u220C");
+      var $L97 = $L("\u2209");
+      var $L98 = $L("&");
+      var $L99 = $L("|");
+      var $L100 = $L(";");
+      var $L101 = $L("$:");
+      var $L102 = $L("own");
+      var $L103 = $L("break");
+      var $L104 = $L("continue");
+      var $L105 = $L("debugger");
+      var $L106 = $L("assert");
+      var $L107 = $L(":=");
+      var $L108 = $L("\u2254");
+      var $L109 = $L(".=");
+      var $L110 = $L("/*");
+      var $L111 = $L("*/");
+      var $L112 = $L("\\");
+      var $L113 = $L("[");
+      var $L114 = $L("`");
+      var $L115 = $L("abstract");
+      var $L116 = $L("as");
+      var $L117 = $L("@");
+      var $L118 = $L("@@");
+      var $L119 = $L("async");
+      var $L120 = $L("await");
+      var $L121 = $L("by");
+      var $L122 = $L("case");
+      var $L123 = $L("catch");
+      var $L124 = $L("class");
+      var $L125 = $L(")");
+      var $L126 = $L("#{");
+      var $L127 = $L("declare");
+      var $L128 = $L("default");
+      var $L129 = $L("delete");
+      var $L130 = $L("do");
+      var $L131 = $L("..");
+      var $L132 = $L("\u2025");
+      var $L133 = $L("...");
+      var $L134 = $L("\u2026");
+      var $L135 = $L("::");
+      var $L136 = $L('"');
+      var $L137 = $L("each");
       var $L138 = $L("else");
       var $L139 = $L("export");
       var $L140 = $L("extends");
@@ -3830,41 +3980,42 @@ ${input.slice(result.pos)}
       var $L169 = $L("'");
       var $L170 = $L("static");
       var $L171 = $L("${");
-      var $L172 = $L("switch");
-      var $L173 = $L("target");
-      var $L174 = $L("then");
-      var $L175 = $L("this");
-      var $L176 = $L("throw");
-      var $L177 = $L('"""');
-      var $L178 = $L("'''");
-      var $L179 = $L("///");
-      var $L180 = $L("```");
-      var $L181 = $L("try");
-      var $L182 = $L("typeof");
-      var $L183 = $L("unless");
-      var $L184 = $L("until");
-      var $L185 = $L("var");
-      var $L186 = $L("void");
-      var $L187 = $L("when");
-      var $L188 = $L("while");
-      var $L189 = $L("yield");
-      var $L190 = $L("/>");
-      var $L191 = $L("</");
-      var $L192 = $L("<>");
-      var $L193 = $L("</>");
-      var $L194 = $L("<!--");
-      var $L195 = $L("-->");
-      var $L196 = $L("type");
-      var $L197 = $L("enum");
-      var $L198 = $L("interface");
-      var $L199 = $L("global");
-      var $L200 = $L("module");
-      var $L201 = $L("namespace");
-      var $L202 = $L("asserts");
-      var $L203 = $L("keyof");
-      var $L204 = $L("infer");
-      var $L205 = $L("[]");
-      var $L206 = $L("civet");
+      var $L172 = $L("super");
+      var $L173 = $L("switch");
+      var $L174 = $L("target");
+      var $L175 = $L("then");
+      var $L176 = $L("this");
+      var $L177 = $L("throw");
+      var $L178 = $L('"""');
+      var $L179 = $L("'''");
+      var $L180 = $L("///");
+      var $L181 = $L("```");
+      var $L182 = $L("try");
+      var $L183 = $L("typeof");
+      var $L184 = $L("unless");
+      var $L185 = $L("until");
+      var $L186 = $L("var");
+      var $L187 = $L("void");
+      var $L188 = $L("when");
+      var $L189 = $L("while");
+      var $L190 = $L("yield");
+      var $L191 = $L("/>");
+      var $L192 = $L("</");
+      var $L193 = $L("<>");
+      var $L194 = $L("</>");
+      var $L195 = $L("<!--");
+      var $L196 = $L("-->");
+      var $L197 = $L("type");
+      var $L198 = $L("enum");
+      var $L199 = $L("interface");
+      var $L200 = $L("global");
+      var $L201 = $L("module");
+      var $L202 = $L("namespace");
+      var $L203 = $L("asserts");
+      var $L204 = $L("keyof");
+      var $L205 = $L("infer");
+      var $L206 = $L("[]");
+      var $L207 = $L("civet");
       var $R0 = $R(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
       var $R1 = $R(new RegExp("[0-9]", "suy"));
       var $R2 = $R(new RegExp("[)}]", "suy"));
@@ -3875,7 +4026,7 @@ ${input.slice(result.pos)}
       var $R7 = $R(new RegExp("<(?!\\p{ID_Start}|[_$])", "suy"));
       var $R8 = $R(new RegExp("!\\^\\^?", "suy"));
       var $R9 = $R(new RegExp("(?!\\+\\+|--)[!~+-](?!\\s|[!~+-]*[&.])", "suy"));
-      var $R10 = $R(new RegExp("(?=[\\s\\)])", "suy"));
+      var $R10 = $R(new RegExp("(?=[\\s\\),])", "suy"));
       var $R11 = $R(new RegExp('[^;"\\s]+', "suy"));
       var $R12 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
       var $R13 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
@@ -5509,10 +5660,7 @@ ${input.slice(result.pos)}
         var head = $2;
         var body = $3;
         if (head.token === "&") {
-          const ref = {
-            type: "Ref",
-            base: "$"
-          };
+          const ref = makeRef("$");
           const arrowBody = {
             type: "PipelineExpression",
             children: [ws, ref, body]
@@ -6425,14 +6573,14 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CallExpression$0 = $TS($S($EXPECT($L16, fail, 'CallExpression "super"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+      var CallExpression$0 = $TS($S(Super, ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
         var rest = $3;
         return processCallMemberExpression({
           type: "CallExpression",
           children: [$1, ...$2, ...rest.flat()]
         });
       });
-      var CallExpression$1 = $TS($S($EXPECT($L17, fail, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+      var CallExpression$1 = $TS($S($EXPECT($L16, fail, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
         var rest = $3;
         return processCallMemberExpression({
           type: "CallExpression",
@@ -6560,7 +6708,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var NonNullAssertion$0 = $T($S($EXPECT($L18, fail, 'NonNullAssertion "!"'), $N($EXPECT($L19, fail, 'NonNullAssertion "^"'))), function(value) {
+      var NonNullAssertion$0 = $T($S($EXPECT($L17, fail, 'NonNullAssertion "!"'), $N($EXPECT($L18, fail, 'NonNullAssertion "^"'))), function(value) {
         return { "type": "NonNullAssertion", "ts": true, "children": value[0] };
       });
       function NonNullAssertion(state) {
@@ -6704,7 +6852,7 @@ ${input.slice(result.pos)}
           ]
         };
       });
-      var MemberBracketContent$3 = $TS($S(Dot, $EXPECT($L20, fail, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+      var MemberBracketContent$3 = $TS($S(Dot, $EXPECT($L19, fail, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
         var dot = $1;
         var neg = $2;
         var num = $3;
@@ -6924,8 +7072,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var SuperProperty$0 = $S($EXPECT($L16, fail, 'SuperProperty "super"'), MemberBracketContent);
-      var SuperProperty$1 = $S($EXPECT($L16, fail, 'SuperProperty "super"'), $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
+      var SuperProperty$0 = $S(Super, MemberBracketContent);
+      var SuperProperty$1 = $S(Super, $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
       function SuperProperty(state) {
         let eventData;
         if (state.events) {
@@ -6949,7 +7097,7 @@ ${input.slice(result.pos)}
         }
       }
       var MetaProperty$0 = $S(New, Dot, Target);
-      var MetaProperty$1 = $TS($S($EXPECT($L21, fail, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var MetaProperty$1 = $TS($S($EXPECT($L20, fail, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       var MetaProperty$2 = ReturnValue;
@@ -6975,7 +7123,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ReturnValue$0 = $TV($C($S($EXPECT($L22, fail, 'ReturnValue "return.value"'), NonIdContinue), $S(Return, $Y(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
+      var ReturnValue$0 = $TV($C($S($EXPECT($L21, fail, 'ReturnValue "return.value"'), NonIdContinue), $S(Return, $Y(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
         return { type: "ReturnValue", children: [$1[0]] };
       });
       function ReturnValue(state) {
@@ -7283,11 +7431,7 @@ ${input.slice(result.pos)}
       });
       var AtIdentifierRef$1 = $TV(IdentifierName, function($skip, $loc, $0, $1) {
         var id = $0;
-        return {
-          type: "Ref",
-          base: id.name,
-          id: id.name
-        };
+        return makeRef(id.name);
       });
       function AtIdentifierRef(state) {
         let eventData;
@@ -7311,7 +7455,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var PinPattern$0 = $TS($S($EXPECT($L19, fail, 'PinPattern "^"'), Identifier), function($skip, $loc, $0, $1, $2) {
+      var PinPattern$0 = $TS($S($EXPECT($L18, fail, 'PinPattern "^"'), Identifier), function($skip, $loc, $0, $1, $2) {
         var identifier = $2;
         return {
           type: "PinPattern",
@@ -7684,7 +7828,7 @@ ${input.slice(result.pos)}
           names: value.names
         };
       });
-      var BindingProperty$2 = $TS($S($E(_), $E($EXPECT($L19, fail, 'BindingProperty "^"')), BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var BindingProperty$2 = $TS($S($E(_), $E($EXPECT($L18, fail, 'BindingProperty "^"')), BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var ws = $1;
         var pin = $2;
         var binding = $3;
@@ -7829,7 +7973,7 @@ ${input.slice(result.pos)}
           children: [ws, binding]
         };
       });
-      var BindingElement$2 = $TV($Y($S($E(_), $EXPECT($L23, fail, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
+      var BindingElement$2 = $TV($Y($S($E(_), $EXPECT($L22, fail, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
         return {
           children: [{
             type: "ElisionElement",
@@ -7909,11 +8053,7 @@ ${input.slice(result.pos)}
         }
       }
       var EmptyBindingPattern$0 = $TV($EXPECT($L0, fail, 'EmptyBindingPattern ""'), function($skip, $loc, $0, $1) {
-        const ref = {
-          type: "Ref",
-          base: "ref",
-          id: "ref"
-        };
+        const ref = makeRef();
         return {
           type: "EmptyBinding",
           children: [ref],
@@ -8071,11 +8211,7 @@ ${input.slice(result.pos)}
           return $skip;
         let body, ref;
         if (!rhs) {
-          body = ref = {
-            type: "Ref",
-            base: "$",
-            id: "$"
-          };
+          body = ref = makeRef("$");
         } else {
           let exp = rhs;
           while (!exp.ref && exp.expression) {
@@ -8255,11 +8391,7 @@ ${input.slice(result.pos)}
         var binopRHS = $3;
         if (!callExpRest && !binopRHS && !unaryPostfix)
           return $skip;
-        const ref = {
-          type: "Ref",
-          base: "$",
-          id: "$"
-        };
+        const ref = makeRef("$");
         let exp = {
           type: "AmpersandRef",
           children: [ref],
@@ -8379,7 +8511,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Arrow$0 = $TV($C($EXPECT($L24, fail, 'Arrow "->"'), $EXPECT($L25, fail, 'Arrow "\u2192"')), function($skip, $loc, $0, $1) {
+      var Arrow$0 = $TV($C($EXPECT($L23, fail, 'Arrow "->"'), $EXPECT($L24, fail, 'Arrow "\u2192"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "->" };
       });
       function Arrow(state) {
@@ -8909,7 +9041,7 @@ ${input.slice(result.pos)}
           children: [$1, expressions]
         };
       });
-      var BracedContent$2 = $TV($Y($S(__, $EXPECT($L26, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
+      var BracedContent$2 = $TV($Y($S(__, $EXPECT($L25, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
         const expressions = [];
         return {
           type: "BlockStatement",
@@ -9090,7 +9222,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var NullLiteral$0 = $TS($S($EXPECT($L27, fail, 'NullLiteral "null"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var NullLiteral$0 = $TS($S($EXPECT($L26, fail, 'NullLiteral "null"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function NullLiteral(state) {
@@ -9118,7 +9250,7 @@ ${input.slice(result.pos)}
       var BooleanLiteral$0 = $T($S(CoffeeBooleansEnabled, CoffeeScriptBooleanLiteral), function(value) {
         return value[1];
       });
-      var BooleanLiteral$1 = $TS($S($C($EXPECT($L28, fail, 'BooleanLiteral "true"'), $EXPECT($L29, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BooleanLiteral$1 = $TS($S($C($EXPECT($L27, fail, 'BooleanLiteral "true"'), $EXPECT($L28, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function BooleanLiteral(state) {
@@ -9143,10 +9275,10 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L30, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L31, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L29, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L30, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "true" };
       });
-      var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L32, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L33, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L31, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L32, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "false" };
       });
       function CoffeeScriptBooleanLiteral(state) {
@@ -9252,7 +9384,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L3, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L3, fail, 'UpcomingAssignment "="'), $EXPECT($L34, fail, 'UpcomingAssignment ">"')))));
+      var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L3, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L3, fail, 'UpcomingAssignment "="'), $EXPECT($L33, fail, 'UpcomingAssignment ">"')))));
       function UpcomingAssignment(state) {
         let eventData;
         if (state.events) {
@@ -9516,7 +9648,7 @@ ${input.slice(result.pos)}
         }
       }
       var ArrayElementDelimiter$0 = $S(__, Comma);
-      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L35, fail, 'ArrayElementDelimiter "]"')));
+      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L34, fail, 'ArrayElementDelimiter "]"')));
       var ArrayElementDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
         return value[1];
       });
@@ -9637,12 +9769,7 @@ ${input.slice(result.pos)}
         var ws = $2;
         var dots = $3;
         if (!exp) {
-          exp = {
-            type: "Ref",
-            base: "ref",
-            id: "ref",
-            names: []
-          };
+          exp = { ...makeRef(), names: [] };
         }
         return {
           type: "SpreadElement",
@@ -10027,7 +10154,7 @@ ${input.slice(result.pos)}
         }
       }
       var ObjectPropertyDelimiter$0 = $S($E(_), Comma);
-      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L26, fail, 'ObjectPropertyDelimiter "}"')));
+      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L25, fail, 'ObjectPropertyDelimiter "}"')));
       var ObjectPropertyDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
         return value[1];
       });
@@ -10307,7 +10434,7 @@ ${input.slice(result.pos)}
           implicit: true
         };
       });
-      var ComputedPropertyName$2 = $TS($S(InsertOpenBracket, $EXPECT($L20, fail, 'ComputedPropertyName "-"'), NumericLiteral, InsertCloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ComputedPropertyName$2 = $TS($S(InsertOpenBracket, $EXPECT($L19, fail, 'ComputedPropertyName "-"'), NumericLiteral, InsertCloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
         const expression = [$2, $3];
         return {
           type: "ComputedPropertyName",
@@ -10727,22 +10854,22 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var AssignmentOpSymbol$0 = $EXPECT($L36, fail, 'AssignmentOpSymbol "**="');
-      var AssignmentOpSymbol$1 = $EXPECT($L37, fail, 'AssignmentOpSymbol "*="');
-      var AssignmentOpSymbol$2 = $EXPECT($L38, fail, 'AssignmentOpSymbol "/="');
-      var AssignmentOpSymbol$3 = $EXPECT($L39, fail, 'AssignmentOpSymbol "%="');
-      var AssignmentOpSymbol$4 = $EXPECT($L40, fail, 'AssignmentOpSymbol "+="');
-      var AssignmentOpSymbol$5 = $EXPECT($L41, fail, 'AssignmentOpSymbol "-="');
-      var AssignmentOpSymbol$6 = $EXPECT($L42, fail, 'AssignmentOpSymbol "<<="');
-      var AssignmentOpSymbol$7 = $EXPECT($L43, fail, 'AssignmentOpSymbol ">>>="');
-      var AssignmentOpSymbol$8 = $EXPECT($L44, fail, 'AssignmentOpSymbol ">>="');
-      var AssignmentOpSymbol$9 = $EXPECT($L45, fail, 'AssignmentOpSymbol "&&="');
-      var AssignmentOpSymbol$10 = $EXPECT($L46, fail, 'AssignmentOpSymbol "&="');
-      var AssignmentOpSymbol$11 = $EXPECT($L47, fail, 'AssignmentOpSymbol "^="');
-      var AssignmentOpSymbol$12 = $EXPECT($L48, fail, 'AssignmentOpSymbol "||="');
-      var AssignmentOpSymbol$13 = $EXPECT($L49, fail, 'AssignmentOpSymbol "|="');
-      var AssignmentOpSymbol$14 = $EXPECT($L50, fail, 'AssignmentOpSymbol "??="');
-      var AssignmentOpSymbol$15 = $T($EXPECT($L51, fail, 'AssignmentOpSymbol "?="'), function(value) {
+      var AssignmentOpSymbol$0 = $EXPECT($L35, fail, 'AssignmentOpSymbol "**="');
+      var AssignmentOpSymbol$1 = $EXPECT($L36, fail, 'AssignmentOpSymbol "*="');
+      var AssignmentOpSymbol$2 = $EXPECT($L37, fail, 'AssignmentOpSymbol "/="');
+      var AssignmentOpSymbol$3 = $EXPECT($L38, fail, 'AssignmentOpSymbol "%="');
+      var AssignmentOpSymbol$4 = $EXPECT($L39, fail, 'AssignmentOpSymbol "+="');
+      var AssignmentOpSymbol$5 = $EXPECT($L40, fail, 'AssignmentOpSymbol "-="');
+      var AssignmentOpSymbol$6 = $EXPECT($L41, fail, 'AssignmentOpSymbol "<<="');
+      var AssignmentOpSymbol$7 = $EXPECT($L42, fail, 'AssignmentOpSymbol ">>>="');
+      var AssignmentOpSymbol$8 = $EXPECT($L43, fail, 'AssignmentOpSymbol ">>="');
+      var AssignmentOpSymbol$9 = $EXPECT($L44, fail, 'AssignmentOpSymbol "&&="');
+      var AssignmentOpSymbol$10 = $EXPECT($L45, fail, 'AssignmentOpSymbol "&="');
+      var AssignmentOpSymbol$11 = $EXPECT($L46, fail, 'AssignmentOpSymbol "^="');
+      var AssignmentOpSymbol$12 = $EXPECT($L47, fail, 'AssignmentOpSymbol "||="');
+      var AssignmentOpSymbol$13 = $EXPECT($L48, fail, 'AssignmentOpSymbol "|="');
+      var AssignmentOpSymbol$14 = $EXPECT($L49, fail, 'AssignmentOpSymbol "??="');
+      var AssignmentOpSymbol$15 = $T($EXPECT($L50, fail, 'AssignmentOpSymbol "?="'), function(value) {
         return "??=";
       });
       var AssignmentOpSymbol$16 = $T($S($EXPECT($L3, fail, 'AssignmentOpSymbol "="'), $N($EXPECT($L3, fail, 'AssignmentOpSymbol "="'))), function(value) {
@@ -10773,10 +10900,10 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CoffeeWordAssignmentOp$0 = $T($EXPECT($L52, fail, 'CoffeeWordAssignmentOp "and="'), function(value) {
+      var CoffeeWordAssignmentOp$0 = $T($EXPECT($L51, fail, 'CoffeeWordAssignmentOp "and="'), function(value) {
         return "&&=";
       });
-      var CoffeeWordAssignmentOp$1 = $T($EXPECT($L53, fail, 'CoffeeWordAssignmentOp "or="'), function(value) {
+      var CoffeeWordAssignmentOp$1 = $T($EXPECT($L52, fail, 'CoffeeWordAssignmentOp "or="'), function(value) {
         return "||=";
       });
       function CoffeeWordAssignmentOp(state) {
@@ -10883,27 +11010,27 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var BinaryOpSymbol$0 = $EXPECT($L54, fail, 'BinaryOpSymbol "**"');
-      var BinaryOpSymbol$1 = $EXPECT($L55, fail, 'BinaryOpSymbol "*"');
-      var BinaryOpSymbol$2 = $EXPECT($L56, fail, 'BinaryOpSymbol "/"');
-      var BinaryOpSymbol$3 = $TV($EXPECT($L57, fail, 'BinaryOpSymbol "%%"'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$0 = $EXPECT($L53, fail, 'BinaryOpSymbol "**"');
+      var BinaryOpSymbol$1 = $EXPECT($L54, fail, 'BinaryOpSymbol "*"');
+      var BinaryOpSymbol$2 = $EXPECT($L55, fail, 'BinaryOpSymbol "/"');
+      var BinaryOpSymbol$3 = $TV($EXPECT($L56, fail, 'BinaryOpSymbol "%%"'), function($skip, $loc, $0, $1) {
         return {
           call: module.getRef("modulo"),
           special: true
         };
       });
-      var BinaryOpSymbol$4 = $EXPECT($L58, fail, 'BinaryOpSymbol "%"');
-      var BinaryOpSymbol$5 = $EXPECT($L59, fail, 'BinaryOpSymbol "+"');
-      var BinaryOpSymbol$6 = $EXPECT($L20, fail, 'BinaryOpSymbol "-"');
-      var BinaryOpSymbol$7 = $EXPECT($L60, fail, 'BinaryOpSymbol "<="');
-      var BinaryOpSymbol$8 = $T($EXPECT($L61, fail, 'BinaryOpSymbol "\u2264"'), function(value) {
+      var BinaryOpSymbol$4 = $EXPECT($L57, fail, 'BinaryOpSymbol "%"');
+      var BinaryOpSymbol$5 = $EXPECT($L58, fail, 'BinaryOpSymbol "+"');
+      var BinaryOpSymbol$6 = $EXPECT($L19, fail, 'BinaryOpSymbol "-"');
+      var BinaryOpSymbol$7 = $EXPECT($L59, fail, 'BinaryOpSymbol "<="');
+      var BinaryOpSymbol$8 = $T($EXPECT($L60, fail, 'BinaryOpSymbol "\u2264"'), function(value) {
         return "<=";
       });
-      var BinaryOpSymbol$9 = $EXPECT($L62, fail, 'BinaryOpSymbol ">="');
-      var BinaryOpSymbol$10 = $T($EXPECT($L63, fail, 'BinaryOpSymbol "\u2265"'), function(value) {
+      var BinaryOpSymbol$9 = $EXPECT($L61, fail, 'BinaryOpSymbol ">="');
+      var BinaryOpSymbol$10 = $T($EXPECT($L62, fail, 'BinaryOpSymbol "\u2265"'), function(value) {
         return ">=";
       });
-      var BinaryOpSymbol$11 = $TV($EXPECT($L64, fail, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$11 = $TV($EXPECT($L63, fail, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
         return {
           $loc,
           token: "instanceof",
@@ -10911,7 +11038,7 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var BinaryOpSymbol$12 = $TV($EXPECT($L65, fail, 'BinaryOpSymbol "!<?"'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$12 = $TV($EXPECT($L64, fail, 'BinaryOpSymbol "!<?"'), function($skip, $loc, $0, $1) {
         return {
           $loc,
           token: "instanceof",
@@ -10920,79 +11047,79 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var BinaryOpSymbol$13 = $EXPECT($L66, fail, 'BinaryOpSymbol "<<"');
-      var BinaryOpSymbol$14 = $T($EXPECT($L67, fail, 'BinaryOpSymbol "\xAB"'), function(value) {
+      var BinaryOpSymbol$13 = $EXPECT($L65, fail, 'BinaryOpSymbol "<<"');
+      var BinaryOpSymbol$14 = $T($EXPECT($L66, fail, 'BinaryOpSymbol "\xAB"'), function(value) {
         return "<<";
       });
       var BinaryOpSymbol$15 = $TR($EXPECT($R7, fail, "BinaryOpSymbol /<(?!\\p{ID_Start}|[_$])/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return "<";
       });
-      var BinaryOpSymbol$16 = $EXPECT($L68, fail, 'BinaryOpSymbol ">>>"');
-      var BinaryOpSymbol$17 = $T($EXPECT($L69, fail, 'BinaryOpSymbol "\u22D9"'), function(value) {
+      var BinaryOpSymbol$16 = $EXPECT($L67, fail, 'BinaryOpSymbol ">>>"');
+      var BinaryOpSymbol$17 = $T($EXPECT($L68, fail, 'BinaryOpSymbol "\u22D9"'), function(value) {
         return ">>>";
       });
-      var BinaryOpSymbol$18 = $EXPECT($L70, fail, 'BinaryOpSymbol ">>"');
-      var BinaryOpSymbol$19 = $T($EXPECT($L71, fail, 'BinaryOpSymbol "\xBB"'), function(value) {
+      var BinaryOpSymbol$18 = $EXPECT($L69, fail, 'BinaryOpSymbol ">>"');
+      var BinaryOpSymbol$19 = $T($EXPECT($L70, fail, 'BinaryOpSymbol "\xBB"'), function(value) {
         return ">>";
       });
-      var BinaryOpSymbol$20 = $EXPECT($L34, fail, 'BinaryOpSymbol ">"');
-      var BinaryOpSymbol$21 = $EXPECT($L72, fail, 'BinaryOpSymbol "!=="');
-      var BinaryOpSymbol$22 = $T($EXPECT($L73, fail, 'BinaryOpSymbol "\u2262"'), function(value) {
+      var BinaryOpSymbol$20 = $EXPECT($L33, fail, 'BinaryOpSymbol ">"');
+      var BinaryOpSymbol$21 = $EXPECT($L71, fail, 'BinaryOpSymbol "!=="');
+      var BinaryOpSymbol$22 = $T($EXPECT($L72, fail, 'BinaryOpSymbol "\u2262"'), function(value) {
         return "!==";
       });
-      var BinaryOpSymbol$23 = $TV($C($EXPECT($L74, fail, 'BinaryOpSymbol "!="'), $EXPECT($L75, fail, 'BinaryOpSymbol "\u2260"')), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$23 = $TV($C($EXPECT($L73, fail, 'BinaryOpSymbol "!="'), $EXPECT($L74, fail, 'BinaryOpSymbol "\u2260"')), function($skip, $loc, $0, $1) {
         if (module.config.coffeeEq)
           return "!==";
         return "!=";
       });
-      var BinaryOpSymbol$24 = $TS($S($EXPECT($L76, fail, 'BinaryOpSymbol "isnt"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpSymbol$24 = $TS($S($EXPECT($L75, fail, 'BinaryOpSymbol "isnt"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         if (module.config.coffeeIsnt)
           return "!==";
         return $skip;
       });
-      var BinaryOpSymbol$25 = $EXPECT($L77, fail, 'BinaryOpSymbol "==="');
-      var BinaryOpSymbol$26 = $T($C($EXPECT($L78, fail, 'BinaryOpSymbol "\u2263"'), $EXPECT($L79, fail, 'BinaryOpSymbol "\u2A76"')), function(value) {
+      var BinaryOpSymbol$25 = $EXPECT($L76, fail, 'BinaryOpSymbol "==="');
+      var BinaryOpSymbol$26 = $T($C($EXPECT($L77, fail, 'BinaryOpSymbol "\u2263"'), $EXPECT($L78, fail, 'BinaryOpSymbol "\u2A76"')), function(value) {
         return "===";
       });
-      var BinaryOpSymbol$27 = $TV($C($EXPECT($L80, fail, 'BinaryOpSymbol "=="'), $EXPECT($L81, fail, 'BinaryOpSymbol "\u2261"'), $EXPECT($L82, fail, 'BinaryOpSymbol "\u2A75"')), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$27 = $TV($C($EXPECT($L79, fail, 'BinaryOpSymbol "=="'), $EXPECT($L80, fail, 'BinaryOpSymbol "\u2261"'), $EXPECT($L81, fail, 'BinaryOpSymbol "\u2A75"')), function($skip, $loc, $0, $1) {
         if (module.config.coffeeEq)
           return "===";
         return "==";
       });
-      var BinaryOpSymbol$28 = $T($S($EXPECT($L83, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$28 = $T($S($EXPECT($L82, fail, 'BinaryOpSymbol "and"'), NonIdContinue), function(value) {
         return "&&";
       });
-      var BinaryOpSymbol$29 = $EXPECT($L84, fail, 'BinaryOpSymbol "&&"');
-      var BinaryOpSymbol$30 = $T($S(CoffeeOfEnabled, $EXPECT($L85, fail, 'BinaryOpSymbol "of"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$29 = $EXPECT($L83, fail, 'BinaryOpSymbol "&&"');
+      var BinaryOpSymbol$30 = $T($S(CoffeeOfEnabled, $EXPECT($L84, fail, 'BinaryOpSymbol "of"'), NonIdContinue), function(value) {
         return "in";
       });
-      var BinaryOpSymbol$31 = $T($S($EXPECT($L86, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
+      var BinaryOpSymbol$31 = $T($S($EXPECT($L85, fail, 'BinaryOpSymbol "or"'), NonIdContinue), function(value) {
         return "||";
       });
-      var BinaryOpSymbol$32 = $EXPECT($L87, fail, 'BinaryOpSymbol "||"');
-      var BinaryOpSymbol$33 = $T($EXPECT($L88, fail, 'BinaryOpSymbol "\u2016"'), function(value) {
+      var BinaryOpSymbol$32 = $EXPECT($L86, fail, 'BinaryOpSymbol "||"');
+      var BinaryOpSymbol$33 = $T($EXPECT($L87, fail, 'BinaryOpSymbol "\u2016"'), function(value) {
         return "||";
       });
-      var BinaryOpSymbol$34 = $TV($C($EXPECT($L89, fail, 'BinaryOpSymbol "^^"'), $S($EXPECT($L90, fail, 'BinaryOpSymbol "xor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$34 = $TV($C($EXPECT($L88, fail, 'BinaryOpSymbol "^^"'), $S($EXPECT($L89, fail, 'BinaryOpSymbol "xor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
         return {
           call: module.getRef("xor"),
           special: true
         };
       });
-      var BinaryOpSymbol$35 = $TV($C($EXPECT($R8, fail, "BinaryOpSymbol /!\\^\\^?/"), $S($EXPECT($L91, fail, 'BinaryOpSymbol "xnor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$35 = $TV($C($EXPECT($R8, fail, "BinaryOpSymbol /!\\^\\^?/"), $S($EXPECT($L90, fail, 'BinaryOpSymbol "xnor"'), NonIdContinue)), function($skip, $loc, $0, $1) {
         return {
           call: module.getRef("xnor"),
           special: true
         };
       });
-      var BinaryOpSymbol$36 = $EXPECT($L92, fail, 'BinaryOpSymbol "??"');
-      var BinaryOpSymbol$37 = $T($EXPECT($L93, fail, 'BinaryOpSymbol "\u2047"'), function(value) {
+      var BinaryOpSymbol$36 = $EXPECT($L91, fail, 'BinaryOpSymbol "??"');
+      var BinaryOpSymbol$37 = $T($EXPECT($L92, fail, 'BinaryOpSymbol "\u2047"'), function(value) {
         return "??";
       });
       var BinaryOpSymbol$38 = $T($S(CoffeeBinaryExistentialEnabled, $EXPECT($L5, fail, 'BinaryOpSymbol "?"')), function(value) {
         return "??";
       });
-      var BinaryOpSymbol$39 = $TS($S($EXPECT($L94, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpSymbol$39 = $TS($S($EXPECT($L93, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return {
           $loc,
           token: $1,
@@ -11000,7 +11127,7 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var BinaryOpSymbol$40 = $TS($S(Not, __, $EXPECT($L94, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var BinaryOpSymbol$40 = $TS($S(Not, __, $EXPECT($L93, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
         return {
           $loc,
           token: "instanceof",
@@ -11009,7 +11136,7 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var BinaryOpSymbol$41 = $TV($C($S($N(CoffeeOfEnabled), Not, __, In), $S(CoffeeOfEnabled, Not, __, $EXPECT($L85, fail, 'BinaryOpSymbol "of"'), NonIdContinue)), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$41 = $TV($C($S($N(CoffeeOfEnabled), Not, __, In), $S(CoffeeOfEnabled, Not, __, $EXPECT($L84, fail, 'BinaryOpSymbol "of"'), NonIdContinue)), function($skip, $loc, $0, $1) {
         return {
           $loc,
           token: "in",
@@ -11017,7 +11144,7 @@ ${input.slice(result.pos)}
           negated: true
         };
       });
-      var BinaryOpSymbol$42 = $TV($C($S(Is, __, In), $EXPECT($L95, fail, 'BinaryOpSymbol "\u2208"')), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$42 = $TV($C($S(Is, __, In), $EXPECT($L94, fail, 'BinaryOpSymbol "\u2208"')), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
@@ -11025,14 +11152,14 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var BinaryOpSymbol$43 = $TV($EXPECT($L96, fail, 'BinaryOpSymbol "\u220B"'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$43 = $TV($EXPECT($L95, fail, 'BinaryOpSymbol "\u220B"'), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
           special: true
         };
       });
-      var BinaryOpSymbol$44 = $TV($EXPECT($L97, fail, 'BinaryOpSymbol "\u220C"'), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$44 = $TV($EXPECT($L96, fail, 'BinaryOpSymbol "\u220C"'), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
@@ -11049,7 +11176,7 @@ ${input.slice(result.pos)}
           special: true
         };
       });
-      var BinaryOpSymbol$46 = $TV($C($S(Is, __, Not, __, In), $EXPECT($L98, fail, 'BinaryOpSymbol "\u2209"')), function($skip, $loc, $0, $1) {
+      var BinaryOpSymbol$46 = $TV($C($S(Is, __, Not, __, In), $EXPECT($L97, fail, 'BinaryOpSymbol "\u2209"')), function($skip, $loc, $0, $1) {
         return {
           method: "includes",
           relational: true,
@@ -11093,9 +11220,9 @@ ${input.slice(result.pos)}
       var BinaryOpSymbol$50 = $TS($S(In), function($skip, $loc, $0, $1) {
         return "in";
       });
-      var BinaryOpSymbol$51 = $EXPECT($L99, fail, 'BinaryOpSymbol "&"');
-      var BinaryOpSymbol$52 = $EXPECT($L19, fail, 'BinaryOpSymbol "^"');
-      var BinaryOpSymbol$53 = $EXPECT($L100, fail, 'BinaryOpSymbol "|"');
+      var BinaryOpSymbol$51 = $EXPECT($L98, fail, 'BinaryOpSymbol "&"');
+      var BinaryOpSymbol$52 = $EXPECT($L18, fail, 'BinaryOpSymbol "^"');
+      var BinaryOpSymbol$53 = $EXPECT($L99, fail, 'BinaryOpSymbol "|"');
       function BinaryOpSymbol(state) {
         let eventData;
         if (state.events) {
@@ -11118,8 +11245,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Xor$0 = $EXPECT($L89, fail, 'Xor "^^"');
-      var Xor$1 = $S($EXPECT($L90, fail, 'Xor "xor"'), NonIdContinue);
+      var Xor$0 = $EXPECT($L88, fail, 'Xor "^^"');
+      var Xor$1 = $S($EXPECT($L89, fail, 'Xor "xor"'), NonIdContinue);
       function Xor(state) {
         let eventData;
         if (state.events) {
@@ -11143,7 +11270,7 @@ ${input.slice(result.pos)}
         }
       }
       var Xnor$0 = $R$0($EXPECT($R8, fail, "Xnor /!\\^\\^?/"));
-      var Xnor$1 = $EXPECT($L91, fail, 'Xnor "xnor"');
+      var Xnor$1 = $EXPECT($L90, fail, 'Xnor "xnor"');
       function Xnor(state) {
         let eventData;
         if (state.events) {
@@ -11431,7 +11558,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var EmptyStatement$0 = $TS($S($E(_), $Y($EXPECT($L101, fail, 'EmptyStatement ";"'))), function($skip, $loc, $0, $1, $2) {
+      var EmptyStatement$0 = $TS($S($E(_), $Y($EXPECT($L100, fail, 'EmptyStatement ";"'))), function($skip, $loc, $0, $1, $2) {
         return { type: "EmptyStatement", children: $1 || [] };
       });
       function EmptyStatement(state) {
@@ -11510,7 +11637,7 @@ ${input.slice(result.pos)}
         var w = $3;
         return [id, colon, w];
       });
-      var Label$1 = $S($EXPECT($L102, fail, 'Label "$:"'), Whitespace);
+      var Label$1 = $S($EXPECT($L101, fail, 'Label "$:"'), Whitespace);
       function Label(state) {
         let eventData;
         if (state.events) {
@@ -11988,6 +12115,7 @@ ${input.slice(result.pos)}
           subtype: statement.type,
           children: [statement],
           block: statement.block,
+          statement,
           async
         };
       });
@@ -12238,7 +12366,8 @@ ${input.slice(result.pos)}
           children: [$1, ...$2, ...children],
           declaration,
           block: null,
-          blockPrefix: c.blockPrefix
+          blockPrefix: c.blockPrefix,
+          hoistDec: c.hoistDec
         };
       });
       function ForClause(state) {
@@ -12346,7 +12475,7 @@ ${input.slice(result.pos)}
           if (step) {
             throw new Error("Can't use 'by' with 'from' in CoffeeScript for loops");
           }
-          kind.token = "of";
+          kind = { ...kind, token: "of" };
         } else if (kind.token === "of") {
           if (step) {
             throw new Error("Can't use 'by' with 'of' in CoffeeScript for loops");
@@ -12364,30 +12493,12 @@ ${input.slice(result.pos)}
           }
           kind.token = "in";
         } else if (kind.token === "in") {
-          const counterRef = {
-            type: "Ref",
-            base: "i",
-            id: "i"
-          };
-          const lenRef = {
-            type: "Ref",
-            base: "len",
-            id: "len"
-          };
-          let expRef;
-          switch (exp.type) {
-            case "Identifier":
-              expRef = exp;
-              break;
-            case "RangeExpression":
-              return forRange(open, declaration, exp, step?.[2], close);
-            default:
-              expRef = {
-                type: "Ref",
-                base: "ref",
-                id: "ref"
-              };
+          const counterRef = makeRef("i");
+          const lenRef = makeRef("len");
+          if (exp.type === "RangeExpression") {
+            return forRange(open, declaration, exp, step?.[2], close);
           }
+          const expRef = maybeRef(exp);
           const varRef = declaration;
           let increment = "++", indexAssignment, assignmentNames = [...varRef.names];
           if (index) {
@@ -12496,7 +12607,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CoffeeForDeclaration$0 = $TS($S($E($S(__, $EXPECT($L103, fail, 'CoffeeForDeclaration "own"'), NonIdContinue)), ForBinding), function($skip, $loc, $0, $1, $2) {
+      var CoffeeForDeclaration$0 = $TS($S($E($S(__, $EXPECT($L102, fail, 'CoffeeForDeclaration "own"'), NonIdContinue)), ForBinding), function($skip, $loc, $0, $1, $2) {
         var own = $1;
         var binding = $2;
         return {
@@ -12542,39 +12653,11 @@ ${input.slice(result.pos)}
           children: $0
         };
       });
-      var ForStatementParameters$2 = $TS($S($E($S(Await, __)), OpenParen, __, ForInOfDeclaration, __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
-        var open = $2;
-        var declaration = $4;
-        var op = $6;
-        var exp = $7;
-        var step = $8;
-        var close = $10;
-        if (exp.type === "RangeExpression" && op.token === "of") {
-          return forRange(open, declaration, exp, step, close);
-        } else if (step) {
-          throw new Error("for..of/in cannot use 'by' except with range literals");
-        }
-        return {
-          declaration,
-          children: $0
-        };
+      var ForStatementParameters$2 = $TS($S($E($S(Await, __)), $E($S(Each, __)), $S(OpenParen, __), ForInOfDeclaration, $E($S(__, Comma, __, ForInOfDeclaration)), __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), $S(__, CloseParen)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
+        return processForInOf($0);
       });
-      var ForStatementParameters$3 = $TS($S($E($S(Await, __)), InsertOpenParen, ForInOfDeclaration, __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
-        var open = $2;
-        var declaration = $3;
-        var op = $5;
-        var exp = $6;
-        var step = $7;
-        var close = $8;
-        if (exp.type === "RangeExpression" && op.token === "of") {
-          return forRange(open, declaration, exp, step, close);
-        } else if (step) {
-          throw new Error("for..of/in cannot use 'by' except with range literals");
-        }
-        return {
-          declaration,
-          children: $0
-        };
+      var ForStatementParameters$3 = $TS($S($E($S(Await, __)), $E($S(Each, __)), InsertOpenParen, ForInOfDeclaration, $E($S(__, Comma, __, ForInOfDeclaration)), __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
+        return processForInOf($0);
       });
       var ForStatementParameters$4 = ForRangeParameters;
       function ForStatementParameters(state) {
@@ -12641,6 +12724,7 @@ ${input.slice(result.pos)}
           type: "ForDeclaration",
           children: $0,
           declare: $1,
+          binding,
           names: binding.names
         };
       });
@@ -12675,16 +12759,18 @@ ${input.slice(result.pos)}
           type: "ForDeclaration",
           children: [c, binding],
           declare: c,
+          binding,
           names: binding.names
         };
       });
-      var ForDeclaration$1 = $TS($S(InsertConst, ForBinding, $EXPECT($R10, fail, "ForDeclaration /(?=[\\s\\)])/")), function($skip, $loc, $0, $1, $2, $3) {
+      var ForDeclaration$1 = $TS($S(InsertConst, ForBinding, $EXPECT($R10, fail, "ForDeclaration /(?=[\\s\\),])/")), function($skip, $loc, $0, $1, $2, $3) {
         var c = $1;
         var binding = $2;
         return {
           type: "ForDeclaration",
           children: [c, binding],
           declare: c,
+          binding,
           names: binding.names
         };
       });
@@ -13419,10 +13505,7 @@ ${input.slice(result.pos)}
       }
       var DeclarationCondition$0 = $TV(LexicalDeclaration, function($skip, $loc, $0, $1) {
         var dec = $0;
-        const ref = {
-          type: "Ref",
-          base: "ref"
-        };
+        const ref = makeRef();
         const { decl, bindings } = dec;
         const binding = bindings[0];
         const { pattern, suffix, initializer, splices, thisAssignments } = binding;
@@ -14153,7 +14236,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Break$0 = $TS($S($EXPECT($L104, fail, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Break$0 = $TS($S($EXPECT($L103, fail, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Break(state) {
@@ -14178,7 +14261,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Continue$0 = $TS($S($EXPECT($L105, fail, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Continue$0 = $TS($S($EXPECT($L104, fail, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Continue(state) {
@@ -14203,7 +14286,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Debugger$0 = $TS($S($EXPECT($L106, fail, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Debugger$0 = $TS($S($EXPECT($L105, fail, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Debugger(state) {
@@ -14509,7 +14592,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ImportAssertion$0 = $S($E(_), $EXPECT($L107, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
+      var ImportAssertion$0 = $S($E(_), $EXPECT($L106, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
       function ImportAssertion(state) {
         let eventData;
         if (state.events) {
@@ -15079,7 +15162,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ConstAssignment$0 = $TV($C($EXPECT($L108, fail, 'ConstAssignment ":="'), $EXPECT($L109, fail, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
+      var ConstAssignment$0 = $TV($C($EXPECT($L107, fail, 'ConstAssignment ":="'), $EXPECT($L108, fail, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function ConstAssignment(state) {
@@ -15104,7 +15187,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var LetAssignment$0 = $TV($EXPECT($L110, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
+      var LetAssignment$0 = $TV($EXPECT($L109, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
         return { $loc, token: "=" };
       });
       function LetAssignment(state) {
@@ -15750,7 +15833,7 @@ ${input.slice(result.pos)}
         }
       }
       var RegularExpressionLiteral$0 = HeregexLiteral;
-      var RegularExpressionLiteral$1 = $TV($TEXT($S($EXPECT($L56, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L56, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
+      var RegularExpressionLiteral$1 = $TV($TEXT($S($EXPECT($L55, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L55, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
         return { type: "RegularExpressionLiteral", $loc, token: $1 };
       });
       function RegularExpressionLiteral(state) {
@@ -16317,7 +16400,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L111, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L112, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L112, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L110, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L111, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L111, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { type: "Comment", $loc, token: $1 };
       });
       function JSMultiLineComment(state) {
@@ -16416,7 +16499,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var InlineComment$0 = $TV($TEXT($S($EXPECT($L111, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L112, fail, 'InlineComment "*/"')), $EXPECT($R46, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L112, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var InlineComment$0 = $TV($TEXT($S($EXPECT($L110, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L111, fail, 'InlineComment "*/"')), $EXPECT($R46, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L111, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function InlineComment(state) {
@@ -16513,7 +16596,7 @@ ${input.slice(result.pos)}
       var NonNewlineWhitespace$0 = $TR($EXPECT($R47, fail, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
-      var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L113, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
+      var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L112, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
         return "";
       });
       function NonNewlineWhitespace(state) {
@@ -16665,7 +16748,7 @@ ${input.slice(result.pos)}
         }
       }
       var StatementDelimiter$0 = SemicolonDelimiter;
-      var StatementDelimiter$1 = $S($Y($S(Nested, $C($EXPECT($L4, fail, 'StatementDelimiter "("'), $EXPECT($L114, fail, 'StatementDelimiter "["'), $EXPECT($L115, fail, 'StatementDelimiter "`"'), $EXPECT($L59, fail, 'StatementDelimiter "+"'), $EXPECT($L20, fail, 'StatementDelimiter "-"'), $EXPECT($L55, fail, 'StatementDelimiter "*"'), $EXPECT($L56, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, FatArrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L4, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
+      var StatementDelimiter$1 = $S($Y($S(Nested, $C($EXPECT($L4, fail, 'StatementDelimiter "("'), $EXPECT($L113, fail, 'StatementDelimiter "["'), $EXPECT($L114, fail, 'StatementDelimiter "`"'), $EXPECT($L58, fail, 'StatementDelimiter "+"'), $EXPECT($L19, fail, 'StatementDelimiter "-"'), $EXPECT($L54, fail, 'StatementDelimiter "*"'), $EXPECT($L55, fail, 'StatementDelimiter "/"'), ObjectLiteral, Arrow, FatArrow, $S(Function, $E($S($E(_), Star)), $E(_), $EXPECT($L4, fail, 'StatementDelimiter "("'))))), InsertSemicolon);
       var StatementDelimiter$2 = $Y(EOS);
       function StatementDelimiter(state) {
         let eventData;
@@ -16765,7 +16848,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Abstract$0 = $TV($TEXT($S($EXPECT($L116, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L11, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
+      var Abstract$0 = $TV($TEXT($S($EXPECT($L115, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L11, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1, ts: true };
       });
       function Abstract(state) {
@@ -16790,7 +16873,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Ampersand$0 = $TV($EXPECT($L99, fail, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
+      var Ampersand$0 = $TV($EXPECT($L98, fail, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Ampersand(state) {
@@ -16815,7 +16898,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var As$0 = $TS($S($EXPECT($L117, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var As$0 = $TS($S($EXPECT($L116, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function As(state) {
@@ -16840,7 +16923,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var At$0 = $TV($EXPECT($L118, fail, 'At "@"'), function($skip, $loc, $0, $1) {
+      var At$0 = $TV($EXPECT($L117, fail, 'At "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function At(state) {
@@ -16865,7 +16948,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var AtAt$0 = $TV($EXPECT($L119, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
+      var AtAt$0 = $TV($EXPECT($L118, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "@" };
       });
       function AtAt(state) {
@@ -16890,7 +16973,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Async$0 = $TS($S($EXPECT($L120, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Async$0 = $TS($S($EXPECT($L119, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Async" };
       });
       function Async(state) {
@@ -16915,7 +16998,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Await$0 = $TS($S($EXPECT($L121, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Await$0 = $TS($S($EXPECT($L120, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Await" };
       });
       function Await(state) {
@@ -16940,7 +17023,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Backtick$0 = $TV($EXPECT($L115, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
+      var Backtick$0 = $TV($EXPECT($L114, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Backtick(state) {
@@ -16965,7 +17048,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var By$0 = $TS($S($EXPECT($L122, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var By$0 = $TS($S($EXPECT($L121, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function By(state) {
@@ -16990,7 +17073,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Case$0 = $TS($S($EXPECT($L123, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Case$0 = $TS($S($EXPECT($L122, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Case(state) {
@@ -17015,7 +17098,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Catch$0 = $TS($S($EXPECT($L124, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Catch$0 = $TS($S($EXPECT($L123, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Catch(state) {
@@ -17040,7 +17123,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Class$0 = $TS($S($EXPECT($L125, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Class$0 = $TS($S($EXPECT($L124, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Class(state) {
@@ -17065,7 +17148,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CloseBrace$0 = $TV($EXPECT($L26, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
+      var CloseBrace$0 = $TV($EXPECT($L25, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBrace(state) {
@@ -17090,7 +17173,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CloseBracket$0 = $TV($EXPECT($L35, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
+      var CloseBracket$0 = $TV($EXPECT($L34, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBracket(state) {
@@ -17115,7 +17198,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CloseParen$0 = $TV($EXPECT($L126, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+      var CloseParen$0 = $TV($EXPECT($L125, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseParen(state) {
@@ -17140,7 +17223,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L127, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L126, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "${" };
       });
       function CoffeeSubstitutionStart(state) {
@@ -17190,7 +17273,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Comma$0 = $TV($EXPECT($L23, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+      var Comma$0 = $TV($EXPECT($L22, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Comma(state) {
@@ -17215,7 +17298,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ConstructorShorthand$0 = $TV($EXPECT($L118, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+      var ConstructorShorthand$0 = $TV($EXPECT($L117, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "constructor" };
       });
       function ConstructorShorthand(state) {
@@ -17240,7 +17323,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Declare$0 = $TS($S($EXPECT($L128, fail, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Declare$0 = $TS($S($EXPECT($L127, fail, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Declare(state) {
@@ -17265,7 +17348,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Default$0 = $TS($S($EXPECT($L129, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Default$0 = $TS($S($EXPECT($L128, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Default(state) {
@@ -17290,7 +17373,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Delete$0 = $TS($S($EXPECT($L130, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Delete$0 = $TS($S($EXPECT($L129, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Delete(state) {
@@ -17315,7 +17398,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Do$0 = $TS($S($EXPECT($L131, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Do$0 = $TS($S($EXPECT($L130, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Do(state) {
@@ -17372,10 +17455,10 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var DotDot$0 = $TS($S($EXPECT($L132, fail, 'DotDot ".."'), $N($EXPECT($L6, fail, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
+      var DotDot$0 = $TS($S($EXPECT($L131, fail, 'DotDot ".."'), $N($EXPECT($L6, fail, 'DotDot "."'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
-      var DotDot$1 = $TV($EXPECT($L133, fail, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
+      var DotDot$1 = $TV($EXPECT($L132, fail, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
         return { $loc, token: ".." };
       });
       function DotDot(state) {
@@ -17400,10 +17483,10 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var DotDotDot$0 = $TV($EXPECT($L134, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+      var DotDotDot$0 = $TV($EXPECT($L133, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var DotDotDot$1 = $TV($EXPECT($L135, fail, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
+      var DotDotDot$1 = $TV($EXPECT($L134, fail, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "..." };
       });
       function DotDotDot(state) {
@@ -17428,7 +17511,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var DoubleColon$0 = $TV($EXPECT($L136, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
+      var DoubleColon$0 = $TV($EXPECT($L135, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleColon(state) {
@@ -17453,7 +17536,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var DoubleQuote$0 = $TV($EXPECT($L137, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+      var DoubleQuote$0 = $TV($EXPECT($L136, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleQuote(state) {
@@ -17478,6 +17561,31 @@ ${input.slice(result.pos)}
           return result;
         }
       }
+      var Each$0 = $TS($S($EXPECT($L137, fail, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Each(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("Each", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("Each", state, Each$0(state));
+          if (state.events)
+            state.events.exit?.("Each", state, result, eventData);
+          return result;
+        } else {
+          const result = Each$0(state);
+          if (state.events)
+            state.events.exit?.("Each", state, result, eventData);
+          return result;
+        }
+      }
       var Else$0 = $TS($S($EXPECT($L138, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
@@ -17728,7 +17836,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R50, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+      var Import$0 = $TS($S($EXPECT($L16, fail, 'Import "import"'), $Y($EXPECT($R50, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Import(state) {
@@ -17952,7 +18060,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Of$0 = $TS($S($EXPECT($L85, fail, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Of$0 = $TS($S($EXPECT($L84, fail, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Of(state) {
@@ -18027,7 +18135,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var OpenBracket$0 = $TV($EXPECT($L114, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L113, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(state) {
@@ -18308,7 +18416,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Semicolon$0 = $TV($EXPECT($L101, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
+      var Semicolon$0 = $TV($EXPECT($L100, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Semicolon(state) {
@@ -18358,7 +18466,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Star$0 = $TV($EXPECT($L55, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
+      var Star$0 = $TV($EXPECT($L54, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Star(state) {
@@ -18386,7 +18494,7 @@ ${input.slice(result.pos)}
       var Static$0 = $TS($S($EXPECT($L170, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TS($S($EXPECT($L118, fail, 'Static "@"'), $N($C($EXPECT($L4, fail, 'Static "("'), $EXPECT($L118, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
+      var Static$1 = $TS($S($EXPECT($L117, fail, 'Static "@"'), $N($C($EXPECT($L4, fail, 'Static "("'), $EXPECT($L117, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       function Static(state) {
@@ -18436,7 +18544,32 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Switch$0 = $TS($S($EXPECT($L172, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Super$0 = $TS($S($EXPECT($L172, fail, 'Super "super"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+        return { $loc, token: $1 };
+      });
+      function Super(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("Super", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("Super", state, Super$0(state));
+          if (state.events)
+            state.events.exit?.("Super", state, result, eventData);
+          return result;
+        } else {
+          const result = Super$0(state);
+          if (state.events)
+            state.events.exit?.("Super", state, result, eventData);
+          return result;
+        }
+      }
+      var Switch$0 = $TS($S($EXPECT($L173, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Switch(state) {
@@ -18461,7 +18594,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Target$0 = $TS($S($EXPECT($L173, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Target$0 = $TS($S($EXPECT($L174, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Target(state) {
@@ -18486,7 +18619,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Then$0 = $TS($S(__, $EXPECT($L174, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+      var Then$0 = $TS($S(__, $EXPECT($L175, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: "" };
       });
       function Then(state) {
@@ -18511,7 +18644,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var This$0 = $TS($S($EXPECT($L175, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var This$0 = $TS($S($EXPECT($L176, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function This(state) {
@@ -18536,7 +18669,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Throw$0 = $TS($S($EXPECT($L176, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Throw$0 = $TS($S($EXPECT($L177, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Throw(state) {
@@ -18561,7 +18694,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TripleDoubleQuote$0 = $TV($EXPECT($L177, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+      var TripleDoubleQuote$0 = $TV($EXPECT($L178, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleDoubleQuote(state) {
@@ -18586,7 +18719,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TripleSingleQuote$0 = $TV($EXPECT($L178, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+      var TripleSingleQuote$0 = $TV($EXPECT($L179, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleSingleQuote(state) {
@@ -18611,7 +18744,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TripleSlash$0 = $TV($EXPECT($L179, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+      var TripleSlash$0 = $TV($EXPECT($L180, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "/" };
       });
       function TripleSlash(state) {
@@ -18636,7 +18769,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TripleTick$0 = $TV($EXPECT($L180, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+      var TripleTick$0 = $TV($EXPECT($L181, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleTick(state) {
@@ -18661,7 +18794,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Try$0 = $TS($S($EXPECT($L181, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Try$0 = $TS($S($EXPECT($L182, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Try(state) {
@@ -18686,7 +18819,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Typeof$0 = $TS($S($EXPECT($L182, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Typeof$0 = $TS($S($EXPECT($L183, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Typeof(state) {
@@ -18711,7 +18844,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Unless$0 = $TS($S($EXPECT($L183, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Unless$0 = $TS($S($EXPECT($L184, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Unless(state) {
@@ -18736,7 +18869,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Until$0 = $TS($S($EXPECT($L184, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Until$0 = $TS($S($EXPECT($L185, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Until(state) {
@@ -18761,7 +18894,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Var$0 = $TS($S($EXPECT($L185, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Var$0 = $TS($S($EXPECT($L186, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Var(state) {
@@ -18786,7 +18919,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Void$0 = $TS($S($EXPECT($L186, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Void$0 = $TS($S($EXPECT($L187, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Void(state) {
@@ -18811,7 +18944,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var When$0 = $TS($S($EXPECT($L187, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var When$0 = $TS($S($EXPECT($L188, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "case" };
       });
       function When(state) {
@@ -18836,7 +18969,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var While$0 = $TS($S($EXPECT($L188, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var While$0 = $TS($S($EXPECT($L189, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function While(state) {
@@ -18861,7 +18994,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Yield$0 = $TS($S($EXPECT($L189, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Yield$0 = $TS($S($EXPECT($L190, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1, type: "Yield" };
       });
       function Yield(state) {
@@ -19006,7 +19139,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L155, fail, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L190, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L155, fail, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L191, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         return { type: "JSXElement", children: $0, tag: $2 };
       });
       function JSXSelfClosingElement(state) {
@@ -19082,7 +19215,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXOpeningElement$0 = $S($EXPECT($L155, fail, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L34, fail, 'JSXOpeningElement ">"'));
+      var JSXOpeningElement$0 = $S($EXPECT($L155, fail, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L33, fail, 'JSXOpeningElement ">"'));
       function JSXOpeningElement(state) {
         let eventData;
         if (state.events) {
@@ -19134,7 +19267,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXClosingElement$0 = $S($EXPECT($L191, fail, 'JSXClosingElement "</"'), $E(Whitespace), JSXElementName, $E(Whitespace), $EXPECT($L34, fail, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L192, fail, 'JSXClosingElement "</"'), $E(Whitespace), JSXElementName, $E(Whitespace), $EXPECT($L33, fail, 'JSXClosingElement ">"'));
       function JSXClosingElement(state) {
         let eventData;
         if (state.events) {
@@ -19172,7 +19305,7 @@ ${input.slice(result.pos)}
         ];
         return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
       });
-      var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L192, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L193, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var children = $3;
         $0 = $0.slice(1);
         return {
@@ -19203,7 +19336,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var PushJSXOpeningFragment$0 = $TV($EXPECT($L192, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+      var PushJSXOpeningFragment$0 = $TV($EXPECT($L193, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
         module.JSXTagStack.push("");
         return $1;
       });
@@ -19257,7 +19390,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXClosingFragment$0 = $EXPECT($L193, fail, 'JSXClosingFragment "</>"');
+      var JSXClosingFragment$0 = $EXPECT($L194, fail, 'JSXClosingFragment "</>"');
       function JSXClosingFragment(state) {
         let eventData;
         if (state.events) {
@@ -19837,7 +19970,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var InlineJSXCallExpression$0 = $TS($S($EXPECT($L16, fail, 'InlineJSXCallExpression "super"'), ExplicitArguments, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+      var InlineJSXCallExpression$0 = $TS($S(Super, ExplicitArguments, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
         var args = $2;
         var rest = $3;
         return processCallMemberExpression({
@@ -19849,7 +19982,7 @@ ${input.slice(result.pos)}
           ]
         });
       });
-      var InlineJSXCallExpression$1 = $TS($S($EXPECT($L17, fail, 'InlineJSXCallExpression "import"'), ExplicitArguments, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+      var InlineJSXCallExpression$1 = $TS($S($EXPECT($L16, fail, 'InlineJSXCallExpression "import"'), ExplicitArguments, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
         var args = $2;
         var rest = $3;
         return processCallMemberExpression({
@@ -20097,7 +20230,7 @@ ${input.slice(result.pos)}
         }
         return $skip;
       });
-      var JSXNestedChildren$1 = $TV($Y($C(JSXEOS, $EXPECT($L26, fail, 'JSXNestedChildren "}"'), JSXClosingElement, JSXClosingFragment)), function($skip, $loc, $0, $1) {
+      var JSXNestedChildren$1 = $TV($Y($C(JSXEOS, $EXPECT($L25, fail, 'JSXNestedChildren "}"'), JSXClosingElement, JSXClosingFragment)), function($skip, $loc, $0, $1) {
         return { children: [], jsxChildren: [] };
       });
       function JSXNestedChildren(state) {
@@ -20226,7 +20359,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXComment$0 = $TS($S($EXPECT($L194, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L195, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+      var JSXComment$0 = $TS($S($EXPECT($L195, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L196, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
         return ["{/*", $2, "*/}"];
       });
       function JSXComment(state) {
@@ -20555,7 +20688,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeKeyword$0 = $TS($S($EXPECT($L196, fail, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var TypeKeyword$0 = $TS($S($EXPECT($L197, fail, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function TypeKeyword(state) {
@@ -20580,7 +20713,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Enum$0 = $TS($S($EXPECT($L197, fail, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Enum$0 = $TS($S($EXPECT($L198, fail, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Enum(state) {
@@ -20605,7 +20738,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Interface$0 = $TS($S($EXPECT($L198, fail, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Interface$0 = $TS($S($EXPECT($L199, fail, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Interface(state) {
@@ -20630,7 +20763,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Global$0 = $TS($S($EXPECT($L199, fail, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Global$0 = $TS($S($EXPECT($L200, fail, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Global(state) {
@@ -20655,7 +20788,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Module$0 = $TS($S($EXPECT($L200, fail, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Module$0 = $TS($S($EXPECT($L201, fail, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Module(state) {
@@ -20680,7 +20813,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Namespace$0 = $TS($S($EXPECT($L201, fail, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Namespace$0 = $TS($S($EXPECT($L202, fail, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Namespace(state) {
@@ -21374,7 +21507,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ReturnType$0 = $TS($S($E($S(__, $EXPECT($L202, fail, 'ReturnType "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2) {
+      var ReturnType$0 = $TS($S($E($S(__, $EXPECT($L203, fail, 'ReturnType "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2) {
         var asserts = $1;
         var t = $2;
         if (asserts) {
@@ -21556,9 +21689,9 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeUnaryOp$0 = $S($EXPECT($L203, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
-      var TypeUnaryOp$1 = $S($EXPECT($L182, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
-      var TypeUnaryOp$2 = $S($EXPECT($L204, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
+      var TypeUnaryOp$0 = $S($EXPECT($L204, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
+      var TypeUnaryOp$1 = $S($EXPECT($L183, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
+      var TypeUnaryOp$2 = $S($EXPECT($L205, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
       var TypeUnaryOp$3 = $S($EXPECT($L166, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
       function TypeUnaryOp(state) {
         let eventData;
@@ -21650,8 +21783,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ImportType$0 = $S($EXPECT($L17, fail, 'ImportType "import"'), OpenParen, __, StringLiteral, __, CloseParen, $E($S(Dot, IdentifierName)), $E(TypeArguments));
-      var ImportType$1 = $S($EXPECT($L17, fail, 'ImportType "import"'), InsertOpenParen, Trimmed_, StringLiteral, InsertCloseParen);
+      var ImportType$0 = $S($EXPECT($L16, fail, 'ImportType "import"'), OpenParen, __, StringLiteral, __, CloseParen, $E($S(Dot, IdentifierName)), $E(TypeArguments));
+      var ImportType$1 = $S($EXPECT($L16, fail, 'ImportType "import"'), InsertOpenParen, Trimmed_, StringLiteral, InsertCloseParen);
       function ImportType(state) {
         let eventData;
         if (state.events) {
@@ -21954,10 +22087,10 @@ ${input.slice(result.pos)}
       }
       var TypeLiteral$0 = TypeTemplateLiteral;
       var TypeLiteral$1 = Literal;
-      var TypeLiteral$2 = $TS($S($EXPECT($L186, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var TypeLiteral$2 = $TS($S($EXPECT($L187, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { type: "VoidType", $loc, token: $1 };
       });
-      var TypeLiteral$3 = $TV($EXPECT($L205, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$3 = $TV($EXPECT($L206, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "[]" };
       });
       function TypeLiteral(state) {
@@ -22032,7 +22165,7 @@ ${input.slice(result.pos)}
       var InlineInterfacePropertyDelimiter$1 = $T($S($Y($S($C(IndentedFurther, $E(_)), InlineBasicInterfaceProperty)), InsertComma), function(value) {
         return value[1];
       });
-      var InlineInterfacePropertyDelimiter$2 = $Y($S(__, $C($EXPECT($L12, fail, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L126, fail, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L35, fail, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L26, fail, 'InlineInterfacePropertyDelimiter "}"'))));
+      var InlineInterfacePropertyDelimiter$2 = $Y($S(__, $C($EXPECT($L12, fail, 'InlineInterfacePropertyDelimiter ":"'), $EXPECT($L125, fail, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L34, fail, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L25, fail, 'InlineInterfacePropertyDelimiter "}"'))));
       var InlineInterfacePropertyDelimiter$3 = $Y(EOS);
       function InlineInterfacePropertyDelimiter(state) {
         let eventData;
@@ -22056,10 +22189,10 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeBinaryOp$0 = $TV($EXPECT($L100, fail, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
+      var TypeBinaryOp$0 = $TV($EXPECT($L99, fail, 'TypeBinaryOp "|"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "|" };
       });
-      var TypeBinaryOp$1 = $TV($EXPECT($L99, fail, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
+      var TypeBinaryOp$1 = $TV($EXPECT($L98, fail, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "&" };
       });
       function TypeBinaryOp(state) {
@@ -22113,7 +22246,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeArrowFunction$0 = $TV($C($EXPECT($L9, fail, 'TypeArrowFunction "=>"'), $EXPECT($L10, fail, 'TypeArrowFunction "\u21D2"'), $EXPECT($L24, fail, 'TypeArrowFunction "->"'), $EXPECT($L25, fail, 'TypeArrowFunction "\u2192"')), function($skip, $loc, $0, $1) {
+      var TypeArrowFunction$0 = $TV($C($EXPECT($L9, fail, 'TypeArrowFunction "=>"'), $EXPECT($L10, fail, 'TypeArrowFunction "\u21D2"'), $EXPECT($L23, fail, 'TypeArrowFunction "->"'), $EXPECT($L24, fail, 'TypeArrowFunction "\u2192"')), function($skip, $loc, $0, $1) {
         return { $loc, token: "=>" };
       });
       function TypeArrowFunction(state) {
@@ -22138,7 +22271,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeArguments$0 = $TS($S($EXPECT($L155, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L34, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var TypeArguments$0 = $TS($S($EXPECT($L155, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L33, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
         var args = $2;
         return { ts: true, types: args.map(([, t]) => t), children: $0 };
       });
@@ -22210,7 +22343,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeParameters$0 = $TS($S($E(_), $EXPECT($L155, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L34, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var TypeParameters$0 = $TS($S($E(_), $EXPECT($L155, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L33, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var parameters = $3;
         return {
           type: "TypeParameters",
@@ -22311,7 +22444,7 @@ ${input.slice(result.pos)}
         }
       }
       var TypeParameterDelimiter$0 = $S($Q(_), Comma);
-      var TypeParameterDelimiter$1 = $Y($S(__, $EXPECT($L34, fail, 'TypeParameterDelimiter ">"')));
+      var TypeParameterDelimiter$1 = $Y($S(__, $EXPECT($L33, fail, 'TypeParameterDelimiter ">"')));
       var TypeParameterDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
         return value[1];
       });
@@ -22415,7 +22548,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L207, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
         var options = $3;
         return {
           type: "CivetPrologue",
@@ -23658,11 +23791,7 @@ ${input.slice(result.pos)}
         module.getRef = function(base) {
           if (refs.hasOwnProperty(base))
             return refs[base];
-          const ref = {
-            type: "Ref",
-            base,
-            id: base
-          };
+          const ref = makeRef(base);
           if (declareRef.hasOwnProperty(base))
             declareRef[base](ref);
           return refs[base] = ref;
@@ -24043,12 +24172,14 @@ ${input.slice(result.pos)}
         literalValue,
         makeEmptyBlock,
         makeLeftHandSideExpression,
+        makeRef,
         maybeRef,
         modifyString,
+        processAssignmentDeclaration,
         processBinaryOpExpression,
         processCallMemberExpression,
         processCoffeeInterpolation,
-        processAssignmentDeclaration,
+        processForInOf,
         processProgram,
         processUnaryExpression,
         quoteString,