@danielx/civet 0.6.20 → 0.6.21

package/dist/main.js

@@ -343,11 +343,7 @@ var require_lib = __commonJS({
         exp.children.splice(i, 1, ...wrapIIFE(exp.children, exp.async));
         return;
       }
-      const resultsRef = {
-        type: "Ref",
-        base: "results",
-        id: "results"
-      };
+      const resultsRef = makeRef("results");
       insertPush(exp.block, resultsRef);
       exp.children.splice(
         i,
@@ -425,10 +421,7 @@ var require_lib = __commonJS({
           const parts = [];
           let hoistDec, refAssignment;
           if (prefix.length > 1) {
-            const ref = {
-              type: "Ref",
-              base: "ref"
-            };
+            const ref = makeRef();
             hoistDec = {
               type: "Declaration",
               children: ["let ", ref],
@@ -530,11 +523,7 @@ var require_lib = __commonJS({
         }
         return;
       }
-      const resultsRef = {
-        type: "Ref",
-        base: "results",
-        id: "results"
-      };
+      const resultsRef = makeRef("results");
       const declaration = {
         type: "Declaration",
         children: ["const ", resultsRef, "=[];"]
@@ -1039,13 +1028,123 @@ var require_lib = __commonJS({
       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, "");
@@ -1063,11 +1162,7 @@ var require_lib = __commonJS({
       } 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;
@@ -1207,15 +1302,6 @@ var require_lib = __commonJS({
           };
       }
     }
-    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");
     }
@@ -1311,13 +1397,20 @@ var require_lib = __commonJS({
         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) {
@@ -1810,11 +1903,7 @@ var require_lib = __commonJS({
         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;
         });
@@ -1848,7 +1937,7 @@ var require_lib = __commonJS({
         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",
@@ -1974,7 +2063,7 @@ var require_lib = __commonJS({
                         arg.children.push(access);
                         break outer;
                     }
-                    usingRef = needsRef({});
+                    usingRef = makeRef();
                     initRef = {
                       type: "AssignmentExpression",
                       children: [usingRef, " = ", arg, ","]
@@ -2249,11 +2338,7 @@ var require_lib = __commonJS({
       );
       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];
@@ -2582,13 +2667,15 @@ var require_lib = __commonJS({
       makeAsConst,
       makeEmptyBlock,
       makeLeftHandSideExpression,
+      makeRef,
       maybeRef,
       modifyString,
       needsRef,
+      processAssignmentDeclaration,
       processBinaryOpExpression,
       processCallMemberExpression,
       processCoffeeInterpolation,
-      processAssignmentDeclaration,
+      processForInOf,
       processParams,
       processProgram,
       processReturnValue,
@@ -3429,6 +3516,7 @@ ${input.slice(result.pos)}
       DotDotDot,
       DoubleColon,
       DoubleQuote,
+      Each,
       Else,
       Equals,
       Export,
@@ -3795,75 +3883,76 @@ ${input.slice(result.pos)}
     var $L135 = $L("\u2026");
     var $L136 = $L("::");
     var $L137 = $L('"');
-    var $L138 = $L("else");
-    var $L139 = $L("export");
-    var $L140 = $L("extends");
-    var $L141 = $L("finally");
-    var $L142 = $L("for");
-    var $L143 = $L("from");
-    var $L144 = $L("function");
-    var $L145 = $L("get");
-    var $L146 = $L("set");
-    var $L147 = $L("if");
-    var $L148 = $L("in");
-    var $L149 = $L("let");
-    var $L150 = $L("const");
-    var $L151 = $L("is");
-    var $L152 = $L("loop");
-    var $L153 = $L("new");
-    var $L154 = $L("not");
-    var $L155 = $L("<");
-    var $L156 = $L("operator");
-    var $L157 = $L("public");
-    var $L158 = $L("private");
-    var $L159 = $L("protected");
-    var $L160 = $L("||>");
-    var $L161 = $L("|\u25B7");
-    var $L162 = $L("|>=");
-    var $L163 = $L("\u25B7=");
-    var $L164 = $L("|>");
-    var $L165 = $L("\u25B7");
-    var $L166 = $L("readonly");
-    var $L167 = $L("return");
-    var $L168 = $L("satisfies");
-    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 $L138 = $L("each");
+    var $L139 = $L("else");
+    var $L140 = $L("export");
+    var $L141 = $L("extends");
+    var $L142 = $L("finally");
+    var $L143 = $L("for");
+    var $L144 = $L("from");
+    var $L145 = $L("function");
+    var $L146 = $L("get");
+    var $L147 = $L("set");
+    var $L148 = $L("if");
+    var $L149 = $L("in");
+    var $L150 = $L("let");
+    var $L151 = $L("const");
+    var $L152 = $L("is");
+    var $L153 = $L("loop");
+    var $L154 = $L("new");
+    var $L155 = $L("not");
+    var $L156 = $L("<");
+    var $L157 = $L("operator");
+    var $L158 = $L("public");
+    var $L159 = $L("private");
+    var $L160 = $L("protected");
+    var $L161 = $L("||>");
+    var $L162 = $L("|\u25B7");
+    var $L163 = $L("|>=");
+    var $L164 = $L("\u25B7=");
+    var $L165 = $L("|>");
+    var $L166 = $L("\u25B7");
+    var $L167 = $L("readonly");
+    var $L168 = $L("return");
+    var $L169 = $L("satisfies");
+    var $L170 = $L("'");
+    var $L171 = $L("static");
+    var $L172 = $L("${");
+    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"));
@@ -3874,7 +3963,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"));
@@ -5508,10 +5597,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]
@@ -7282,11 +7368,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;
@@ -7908,11 +7990,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],
@@ -8070,11 +8148,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) {
@@ -8254,11 +8328,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],
@@ -9636,12 +9706,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",
@@ -12237,7 +12302,8 @@ ${input.slice(result.pos)}
         children: [$1, ...$2, ...children],
         declaration,
         block: null,
-        blockPrefix: c.blockPrefix
+        blockPrefix: c.blockPrefix,
+        hoistDec: c.hoistDec
       };
     });
     function ForClause(state) {
@@ -12345,7 +12411,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");
@@ -12363,30 +12429,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) {
@@ -12541,39 +12589,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) {
@@ -12640,6 +12660,7 @@ ${input.slice(result.pos)}
         type: "ForDeclaration",
         children: $0,
         declare: $1,
+        binding,
         names: binding.names
       };
     });
@@ -12674,16 +12695,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
       };
     });
@@ -13418,10 +13441,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;
@@ -17477,7 +17497,32 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Else$0 = $TS($S($EXPECT($L138, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Each$0 = $TS($S($EXPECT($L138, 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($L139, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Else(state) {
@@ -17527,7 +17572,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Export$0 = $TS($S($EXPECT($L139, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Export$0 = $TS($S($EXPECT($L140, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Export(state) {
@@ -17552,7 +17597,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Extends$0 = $TS($S($EXPECT($L140, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Extends$0 = $TS($S($EXPECT($L141, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Extends(state) {
@@ -17577,7 +17622,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Finally$0 = $TS($S($EXPECT($L141, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Finally$0 = $TS($S($EXPECT($L142, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Finally(state) {
@@ -17602,7 +17647,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var For$0 = $TS($S($EXPECT($L142, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var For$0 = $TS($S($EXPECT($L143, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function For(state) {
@@ -17627,7 +17672,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var From$0 = $TS($S($EXPECT($L143, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var From$0 = $TS($S($EXPECT($L144, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function From(state) {
@@ -17652,7 +17697,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Function$0 = $TS($S($EXPECT($L144, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Function$0 = $TS($S($EXPECT($L145, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Function(state) {
@@ -17677,7 +17722,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var GetOrSet$0 = $TS($S($C($EXPECT($L145, fail, 'GetOrSet "get"'), $EXPECT($L146, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var GetOrSet$0 = $TS($S($C($EXPECT($L146, fail, 'GetOrSet "get"'), $EXPECT($L147, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "GetOrSet" };
     });
     function GetOrSet(state) {
@@ -17702,7 +17747,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var If$0 = $TV($TEXT($S($EXPECT($L147, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L11, fail, 'If " "')))), function($skip, $loc, $0, $1) {
+    var If$0 = $TV($TEXT($S($EXPECT($L148, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L11, fail, 'If " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function If(state) {
@@ -17752,7 +17797,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var In$0 = $TS($S($EXPECT($L148, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var In$0 = $TS($S($EXPECT($L149, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function In(state) {
@@ -17777,7 +17822,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetOrConst$0 = $TS($S($C($EXPECT($L149, fail, 'LetOrConst "let"'), $EXPECT($L150, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var LetOrConst$0 = $TS($S($C($EXPECT($L150, fail, 'LetOrConst "let"'), $EXPECT($L151, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function LetOrConst(state) {
@@ -17802,7 +17847,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Const$0 = $TS($S($EXPECT($L150, fail, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Const$0 = $TS($S($EXPECT($L151, fail, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Const(state) {
@@ -17827,7 +17872,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Is$0 = $TS($S($EXPECT($L151, fail, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Is$0 = $TS($S($EXPECT($L152, fail, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Is(state) {
@@ -17876,7 +17921,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Loop$0 = $TS($S($EXPECT($L152, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Loop$0 = $TS($S($EXPECT($L153, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "while(true)" };
     });
     function Loop(state) {
@@ -17901,7 +17946,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var New$0 = $TS($S($EXPECT($L153, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var New$0 = $TS($S($EXPECT($L154, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function New(state) {
@@ -17926,7 +17971,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Not$0 = $TS($S($EXPECT($L154, fail, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L12, fail, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+    var Not$0 = $TS($S($EXPECT($L155, fail, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L12, fail, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
       return { $loc, token: "!" };
     });
     function Not(state) {
@@ -17976,7 +18021,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenAngleBracket$0 = $TV($EXPECT($L155, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+    var OpenAngleBracket$0 = $TV($EXPECT($L156, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenAngleBracket(state) {
@@ -18076,7 +18121,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Operator$0 = $TS($S($EXPECT($L156, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Operator$0 = $TS($S($EXPECT($L157, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Operator(state) {
@@ -18101,7 +18146,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Public$0 = $TS($S($EXPECT($L157, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Public$0 = $TS($S($EXPECT($L158, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Public(state) {
@@ -18126,7 +18171,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Private$0 = $TS($S($EXPECT($L158, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Private$0 = $TS($S($EXPECT($L159, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Private(state) {
@@ -18151,7 +18196,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Protected$0 = $TS($S($EXPECT($L159, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Protected$0 = $TS($S($EXPECT($L160, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Protected(state) {
@@ -18176,13 +18221,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Pipe$0 = $TV($C($EXPECT($L160, fail, 'Pipe "||>"'), $EXPECT($L161, fail, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
+    var Pipe$0 = $TV($C($EXPECT($L161, fail, 'Pipe "||>"'), $EXPECT($L162, fail, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "||>" };
     });
-    var Pipe$1 = $TV($C($EXPECT($L162, fail, 'Pipe "|>="'), $EXPECT($L163, fail, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
+    var Pipe$1 = $TV($C($EXPECT($L163, fail, 'Pipe "|>="'), $EXPECT($L164, fail, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
       return { $loc, token: "|>=" };
     });
-    var Pipe$2 = $TV($C($EXPECT($L164, fail, 'Pipe "|>"'), $EXPECT($L165, fail, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
+    var Pipe$2 = $TV($C($EXPECT($L165, fail, 'Pipe "|>"'), $EXPECT($L166, fail, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "|>" };
     });
     function Pipe(state) {
@@ -18232,7 +18277,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Readonly$0 = $TS($S($EXPECT($L166, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Readonly$0 = $TS($S($EXPECT($L167, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, ts: true };
     });
     function Readonly(state) {
@@ -18257,7 +18302,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Return$0 = $TS($S($EXPECT($L167, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Return$0 = $TS($S($EXPECT($L168, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Return(state) {
@@ -18282,7 +18327,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Satisfies$0 = $TS($S($EXPECT($L168, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Satisfies$0 = $TS($S($EXPECT($L169, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Satisfies(state) {
@@ -18332,7 +18377,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleQuote$0 = $TV($EXPECT($L169, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+    var SingleQuote$0 = $TV($EXPECT($L170, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SingleQuote(state) {
@@ -18382,7 +18427,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Static$0 = $TS($S($EXPECT($L170, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Static$0 = $TS($S($EXPECT($L171, 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) {
@@ -18410,7 +18455,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SubstitutionStart$0 = $TV($EXPECT($L171, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+    var SubstitutionStart$0 = $TV($EXPECT($L172, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SubstitutionStart(state) {
@@ -18435,7 +18480,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Switch$0 = $TS($S($EXPECT($L172, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Switch$0 = $TS($S($EXPECT($L173, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Switch(state) {
@@ -18460,7 +18505,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) {
@@ -18485,7 +18530,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) {
@@ -18510,7 +18555,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) {
@@ -18535,7 +18580,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) {
@@ -18560,7 +18605,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) {
@@ -18585,7 +18630,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) {
@@ -18610,7 +18655,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) {
@@ -18635,7 +18680,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) {
@@ -18660,7 +18705,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) {
@@ -18685,7 +18730,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) {
@@ -18710,7 +18755,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) {
@@ -18735,7 +18780,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) {
@@ -18760,7 +18805,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) {
@@ -18785,7 +18830,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) {
@@ -18810,7 +18855,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) {
@@ -18835,7 +18880,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) {
@@ -18860,7 +18905,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) {
@@ -19005,7 +19050,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($L156, 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) {
@@ -19081,7 +19126,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($L156, fail, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L34, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       let eventData;
       if (state.events) {
@@ -19133,7 +19178,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($L34, fail, 'JSXClosingElement ">"'));
     function JSXClosingElement(state) {
       let eventData;
       if (state.events) {
@@ -19171,7 +19216,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 {
@@ -19202,7 +19247,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) {
       module2.JSXTagStack.push("");
       return $1;
     });
@@ -19256,7 +19301,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) {
@@ -20225,7 +20270,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) {
@@ -20554,7 +20599,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) {
@@ -20579,7 +20624,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) {
@@ -20604,7 +20649,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) {
@@ -20629,7 +20674,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) {
@@ -20654,7 +20699,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) {
@@ -20679,7 +20724,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) {
@@ -21373,7 +21418,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) {
@@ -21413,7 +21458,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L151, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L152, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
       var lhs = $1;
       var rhs = $2;
       if (!rhs)
@@ -21555,10 +21600,10 @@ ${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$3 = $S($EXPECT($L166, fail, 'TypeUnaryOp "readonly"'), 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($L167, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
     function TypeUnaryOp(state) {
       let eventData;
       if (state.events) {
@@ -21821,7 +21866,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L140, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
+    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L141, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
       if ($2)
         return $0;
       return $1;
@@ -21953,10 +21998,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) {
@@ -22137,7 +22182,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($L156, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L34, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       var args = $2;
       return { ts: true, types: args.map(([, t]) => t), children: $0 };
     });
@@ -22209,7 +22254,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($L156, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L34, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var parameters = $3;
       return {
         type: "TypeParameters",
@@ -22240,7 +22285,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameter$0 = $S(__, $E($S($EXPECT($L150, fail, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
+    var TypeParameter$0 = $S(__, $E($S($EXPECT($L151, fail, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
     function TypeParameter(state) {
       let eventData;
       if (state.events) {
@@ -22263,7 +22308,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConstraint$0 = $S(__, $EXPECT($L140, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
+    var TypeConstraint$0 = $S(__, $EXPECT($L141, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
     function TypeConstraint(state) {
       let eventData;
       if (state.events) {
@@ -22414,7 +22459,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",
@@ -23657,11 +23702,7 @@ ${input.slice(result.pos)}
       module2.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;
@@ -24042,12 +24083,14 @@ ${input.slice(result.pos)}
       literalValue,
       makeEmptyBlock,
       makeLeftHandSideExpression,
+      makeRef,
       maybeRef,
       modifyString,
+      processAssignmentDeclaration,
       processBinaryOpExpression,
       processCallMemberExpression,
       processCoffeeInterpolation,
-      processAssignmentDeclaration,
+      processForInOf,
       processProgram,
       processUnaryExpression,
       quoteString,