@danielx/civet 0.6.21 → 0.6.23

package/dist/main.mjs

@@ -24,9 +24,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// source/lib.js
+// source/lib.ts
 var require_lib = __commonJS({
-  "source/lib.js"(exports, module) {
+  "source/lib.ts"(exports, module) {
     "use strict";
     function addParentPointers(node, parent) {
       if (node == null)
@@ -46,6 +46,25 @@ var require_lib = __commonJS({
         }
       }
     }
+    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) {
@@ -335,25 +354,26 @@ var require_lib = __commonJS({
       };
     }
     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 = makeRef("results");
-      insertPush(exp.block, resultsRef);
-      exp.children.splice(
+      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) {
@@ -683,6 +703,7 @@ var require_lib = __commonJS({
     }
     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(",");
       }
@@ -699,7 +720,7 @@ var require_lib = __commonJS({
         indent = expressions[0][0];
       }
       const [splices, thisAssignments] = gatherBindingCode(parameters, {
-        injectParamProps: f.name === "constructor"
+        injectParamProps: isConstructor
       });
       const delimiter = {
         type: "SemicolonDelimiter",
@@ -711,6 +732,23 @@ var require_lib = __commonJS({
           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) {
@@ -731,6 +769,24 @@ var require_lib = __commonJS({
         }
       }
     }
+    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)) {
@@ -826,11 +882,15 @@ var require_lib = __commonJS({
     }
     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) {
@@ -1026,22 +1086,22 @@ 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;
+    function processForInOf($0, getRef) {
+      let [awaits, eachOwn, open, declaration, declaration2, ws, inOf, exp, step, close] = $0;
       if (exp.type === "RangeExpression" && inOf.token === "of" && !declaration2) {
         return forRange(open, declaration, exp, step, close);
       } else if (step) {
         throw new Error("for..of/in cannot use 'by' except with range literals");
       }
-      let eachError;
+      let eachOwnError;
       let hoistDec, blockPrefix = [];
-      if (each) {
+      if (eachOwn && eachOwn[0].token === "each") {
         if (inOf.token === "of") {
           const counterRef = makeRef("i");
           const lenRef = makeRef("len");
-          const expRef = maybeRef(exp);
+          const expRef2 = maybeRef(exp);
           const increment = "++";
-          let indexAssignment, assignmentNames = [...declaration.names];
+          let assignmentNames = [...declaration.names];
           if (declaration2) {
             const [, , ws22, decl22] = declaration2;
             blockPrefix.push(["", [
@@ -1052,34 +1112,46 @@ var require_lib = __commonJS({
             ], ";"]);
             assignmentNames.push(...decl22.names);
           }
-          const expRefDec = expRef !== exp ? [insertTrimmingSpace(expRef, " "), " = ", insertTrimmingSpace(exp, ""), ", "] : [];
+          const expRefDec = expRef2 !== exp ? [insertTrimmingSpace(expRef2, " "), " = ", insertTrimmingSpace(exp, ""), ", "] : [];
           blockPrefix.push(["", {
             type: "AssignmentExpression",
-            children: [declaration, " = ", insertTrimmingSpace(expRef, ""), "[", counterRef, "]"],
+            children: [declaration, " = ", insertTrimmingSpace(expRef2, ""), "[", counterRef, "]"],
             names: assignmentNames
           }, ";"]);
           declaration = {
             type: "Declaration",
-            children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", insertTrimmingSpace(expRef, ""), ".length"],
+            children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", insertTrimmingSpace(expRef2, ""), ".length"],
             names: []
           };
           const condition = [counterRef, " < ", lenRef, "; "];
           const children = [open, declaration, "; ", condition, counterRef, increment, close];
           return { declaration, children, blockPrefix };
         } else {
-          eachError = {
+          eachOwnError = {
             type: "Error",
             message: "'each' is only meaningful in for..of loops"
           };
         }
       }
-      if (!declaration2) {
+      let own = eachOwn && eachOwn[0].token === "own";
+      let expRef;
+      if (own && inOf.token !== "in") {
+        own = false;
+        eachOwnError = {
+          type: "Error",
+          message: "'own' is only meaningful in for..in loops"
+        };
+      }
+      if (!declaration2 && !own) {
         return {
           declaration,
-          children: [awaits, eachError, open, declaration, ws, inOf, exp, step, close]
+          blockPrefix,
+          children: [awaits, eachOwnError, open, declaration, ws, inOf, expRef ?? exp, step, close]
         };
       }
-      const [, , ws2, decl2] = declaration2;
+      let ws2, decl2;
+      if (declaration2)
+        [, , ws2, decl2] = declaration2;
       switch (inOf.token) {
         case "of": {
           const counterRef = makeRef("i");
@@ -1096,16 +1168,16 @@ var require_lib = __commonJS({
           break;
         }
         case "in": {
-          const expRef = maybeRef(exp);
-          if (expRef !== exp) {
+          const expRef2 = maybeRef(exp);
+          if (expRef2 !== exp) {
             hoistDec = {
               type: "Declaration",
-              children: ["let ", expRef],
+              children: ["let ", expRef2],
               names: []
             };
             exp = {
               type: "AssignmentExpression",
-              children: [" ", expRef, " =", exp]
+              children: [" ", expRef2, " =", exp]
             };
           }
           let { binding } = declaration;
@@ -1123,11 +1195,17 @@ var require_lib = __commonJS({
               names: []
             };
           }
-          blockPrefix.push(["", {
-            type: "Declaration",
-            children: [insertTrimmingSpace(ws2, ""), decl2, " = ", insertTrimmingSpace(expRef, ""), "[", insertTrimmingSpace(binding, ""), "]"],
-            names: decl2.names
-          }, ";"]);
+          if (own) {
+            const hasPropRef = getRef("hasProp");
+            blockPrefix.push(["", "if (!", hasPropRef, "(", insertTrimmingSpace(expRef2, ""), ", ", insertTrimmingSpace(binding, ""), ")) continue", ";"]);
+          }
+          if (decl2) {
+            blockPrefix.push(["", {
+              type: "Declaration",
+              children: [insertTrimmingSpace(ws2, ""), decl2, " = ", insertTrimmingSpace(expRef2, ""), "[", insertTrimmingSpace(binding, ""), "]"],
+              names: decl2.names
+            }, ";"]);
+          }
           break;
         }
         default:
@@ -1135,7 +1213,7 @@ var require_lib = __commonJS({
       }
       return {
         declaration,
-        children: [awaits, eachError, open, declaration, ws, inOf, exp, step, close],
+        children: [awaits, eachOwnError, open, declaration, ws, inOf, exp, step, close],
         blockPrefix,
         hoistDec
       };
@@ -1398,11 +1476,11 @@ var require_lib = __commonJS({
       }
       return makeRef(base);
     }
-    function makeRef(base = "ref") {
+    function makeRef(base = "ref", id = base) {
       return {
         type: "Ref",
         base,
-        id: base
+        id
       };
     }
     function maybeRef(exp, base = "ref") {
@@ -1661,20 +1739,20 @@ var require_lib = __commonJS({
       });
     }
     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");
       }
@@ -1889,12 +1967,7 @@ var require_lib = __commonJS({
           input: key
         })) {
           shared.forEach((p) => {
-            const ref = {
-              type: "Ref",
-              base: `_${key}`,
-              id: key
-            };
-            aliasBinding(p, ref);
+            aliasBinding(p, makeRef(`_${key}`, key));
           });
           return;
         }
@@ -2165,8 +2238,8 @@ var require_lib = __commonJS({
       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, []);
@@ -2609,13 +2682,14 @@ var require_lib = __commonJS({
         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,
@@ -3173,6 +3247,7 @@ ${input.slice(result.pos)}
       AccessModifier,
       FieldDefinition,
       ThisLiteral,
+      PrivateThis,
       AtThis,
       LeftHandSideExpression,
       CallExpression,
@@ -3524,6 +3599,7 @@ ${input.slice(result.pos)}
       From,
       Function,
       GetOrSet,
+      Hash,
       If,
       Import,
       In,
@@ -3540,6 +3616,7 @@ ${input.slice(result.pos)}
       OpenBracket,
       OpenParen,
       Operator,
+      Own,
       Public,
       Private,
       Protected,
@@ -3553,6 +3630,7 @@ ${input.slice(result.pos)}
       Star,
       Static,
       SubstitutionStart,
+      Super,
       Switch,
       Target,
       Then,
@@ -3758,164 +3836,164 @@ ${input.slice(result.pos)}
     var $L12 = $L(":");
     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 $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 $L15 = $L("import");
+    var $L16 = $L("!");
+    var $L17 = $L("^");
+    var $L18 = $L("-");
+    var $L19 = $L("import.meta");
+    var $L20 = $L("return.value");
+    var $L21 = $L(",");
+    var $L22 = $L("->");
+    var $L23 = $L("\u2192");
+    var $L24 = $L("}");
+    var $L25 = $L("null");
+    var $L26 = $L("true");
+    var $L27 = $L("false");
+    var $L28 = $L("yes");
+    var $L29 = $L("on");
+    var $L30 = $L("no");
+    var $L31 = $L("off");
+    var $L32 = $L(">");
+    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("and=");
+    var $L51 = $L("or=");
+    var $L52 = $L("**");
+    var $L53 = $L("*");
+    var $L54 = $L("/");
+    var $L55 = $L("%%");
+    var $L56 = $L("%");
+    var $L57 = $L("+");
+    var $L58 = $L("<=");
+    var $L59 = $L("\u2264");
+    var $L60 = $L(">=");
+    var $L61 = $L("\u2265");
+    var $L62 = $L("<?");
+    var $L63 = $L("!<?");
+    var $L64 = $L("<<");
+    var $L65 = $L("\xAB");
+    var $L66 = $L(">>>");
+    var $L67 = $L("\u22D9");
+    var $L68 = $L(">>");
+    var $L69 = $L("\xBB");
+    var $L70 = $L("!==");
+    var $L71 = $L("\u2262");
+    var $L72 = $L("!=");
+    var $L73 = $L("\u2260");
+    var $L74 = $L("isnt");
+    var $L75 = $L("===");
+    var $L76 = $L("\u2263");
+    var $L77 = $L("\u2A76");
+    var $L78 = $L("==");
+    var $L79 = $L("\u2261");
+    var $L80 = $L("\u2A75");
+    var $L81 = $L("and");
+    var $L82 = $L("&&");
+    var $L83 = $L("of");
+    var $L84 = $L("or");
+    var $L85 = $L("||");
+    var $L86 = $L("\u2016");
+    var $L87 = $L("^^");
+    var $L88 = $L("xor");
+    var $L89 = $L("xnor");
+    var $L90 = $L("??");
+    var $L91 = $L("\u2047");
+    var $L92 = $L("instanceof");
+    var $L93 = $L("\u2208");
+    var $L94 = $L("\u220B");
+    var $L95 = $L("\u220C");
+    var $L96 = $L("\u2209");
+    var $L97 = $L("&");
+    var $L98 = $L("|");
+    var $L99 = $L(";");
+    var $L100 = $L("$:");
+    var $L101 = $L("break");
+    var $L102 = $L("continue");
+    var $L103 = $L("debugger");
+    var $L104 = $L("assert");
+    var $L105 = $L(":=");
+    var $L106 = $L("\u2254");
+    var $L107 = $L(".=");
+    var $L108 = $L("/*");
+    var $L109 = $L("*/");
+    var $L110 = $L("\\");
+    var $L111 = $L("[");
+    var $L112 = $L("`");
+    var $L113 = $L("abstract");
+    var $L114 = $L("as");
+    var $L115 = $L("@");
+    var $L116 = $L("@@");
+    var $L117 = $L("async");
+    var $L118 = $L("await");
+    var $L119 = $L("by");
+    var $L120 = $L("case");
+    var $L121 = $L("catch");
+    var $L122 = $L("class");
+    var $L123 = $L(")");
+    var $L124 = $L("#{");
+    var $L125 = $L("declare");
+    var $L126 = $L("default");
+    var $L127 = $L("delete");
+    var $L128 = $L("do");
+    var $L129 = $L("..");
+    var $L130 = $L("\u2025");
+    var $L131 = $L("...");
+    var $L132 = $L("\u2026");
+    var $L133 = $L("::");
+    var $L134 = $L('"');
+    var $L135 = $L("each");
+    var $L136 = $L("else");
+    var $L137 = $L("export");
+    var $L138 = $L("extends");
+    var $L139 = $L("finally");
+    var $L140 = $L("for");
+    var $L141 = $L("from");
+    var $L142 = $L("function");
+    var $L143 = $L("get");
+    var $L144 = $L("set");
+    var $L145 = $L("#");
+    var $L146 = $L("if");
+    var $L147 = $L("in");
+    var $L148 = $L("let");
+    var $L149 = $L("const");
+    var $L150 = $L("is");
+    var $L151 = $L("loop");
+    var $L152 = $L("new");
+    var $L153 = $L("not");
+    var $L154 = $L("<");
+    var $L155 = $L("operator");
+    var $L156 = $L("own");
+    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("super");
     var $L173 = $L("switch");
     var $L174 = $L("target");
     var $L175 = $L("then");
@@ -6430,12 +6508,13 @@ ${input.slice(result.pos)}
       }
     }
     var ThisLiteral$0 = This;
-    var ThisLiteral$1 = $TS($S(AtThis, $TEXT($S($E($EXPECT($L15, fail, 'ThisLiteral "#"')), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+    var ThisLiteral$1 = $TS($S(AtThis, $TEXT($S($E(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
       var at = $1;
       var id = $2;
       return [at, ".", id];
     });
     var ThisLiteral$2 = AtThis;
+    var ThisLiteral$3 = PrivateThis;
     function ThisLiteral(state) {
       let eventData;
       if (state.events) {
@@ -6447,17 +6526,47 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("ThisLiteral", state, ThisLiteral$0(state) || ThisLiteral$1(state) || ThisLiteral$2(state));
+        const result = $TOKEN("ThisLiteral", state, ThisLiteral$0(state) || ThisLiteral$1(state) || ThisLiteral$2(state) || ThisLiteral$3(state));
         if (state.events)
           state.events.exit?.("ThisLiteral", state, result, eventData);
         return result;
       } else {
-        const result = ThisLiteral$0(state) || ThisLiteral$1(state) || ThisLiteral$2(state);
+        const result = ThisLiteral$0(state) || ThisLiteral$1(state) || ThisLiteral$2(state) || ThisLiteral$3(state);
         if (state.events)
           state.events.exit?.("ThisLiteral", state, result, eventData);
         return result;
       }
     }
+    var PrivateThis$0 = $TS($S(PrivateIdentifier, $Y($S($P(_), $C($S(Not, __, In), In)))), function($skip, $loc, $0, $1, $2) {
+      var id = $1;
+      return id;
+    });
+    var PrivateThis$1 = $TV(PrivateIdentifier, function($skip, $loc, $0, $1) {
+      var id = $0;
+      return ["this.", id];
+    });
+    function PrivateThis(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PrivateThis", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PrivateThis", state, PrivateThis$0(state) || PrivateThis$1(state));
+        if (state.events)
+          state.events.exit?.("PrivateThis", state, result, eventData);
+        return result;
+      } else {
+        const result = PrivateThis$0(state) || PrivateThis$1(state);
+        if (state.events)
+          state.events.exit?.("PrivateThis", state, result, eventData);
+        return result;
+      }
+    }
     var AtThis$0 = $TV(At, function($skip, $loc, $0, $1) {
       var at = $0;
       return { ...at, token: "this" };
@@ -6508,14 +6617,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($L15, fail, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
       var rest = $3;
       return processCallMemberExpression({
         type: "CallExpression",
@@ -6643,7 +6752,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($L16, fail, 'NonNullAssertion "!"'), $N($EXPECT($L17, fail, 'NonNullAssertion "^"'))), function(value) {
       return { "type": "NonNullAssertion", "ts": true, "children": value[0] };
     });
     function NonNullAssertion(state) {
@@ -6787,7 +6896,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($L18, fail, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
       var dot = $1;
       var neg = $2;
       var num = $3;
@@ -7007,8 +7116,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) {
@@ -7032,7 +7141,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($L19, fail, 'MetaProperty "import.meta"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     var MetaProperty$2 = ReturnValue;
@@ -7058,7 +7167,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($L20, fail, 'ReturnValue "return.value"'), NonIdContinue), $S(Return, $Y(AfterReturnShorthand))), function($skip, $loc, $0, $1) {
       return { type: "ReturnValue", children: [$1[0]] };
     });
     function ReturnValue(state) {
@@ -7330,8 +7439,17 @@ ${input.slice(result.pos)}
         ref
       };
     });
-    var NWBindingIdentifier$1 = Identifier;
-    var NWBindingIdentifier$2 = $TS($S(ReturnValue), function($skip, $loc, $0, $1) {
+    var NWBindingIdentifier$1 = $TS($S(Hash, AtIdentifierRef), function($skip, $loc, $0, $1, $2) {
+      var ref = $2;
+      ref = { ...ref, id: `#${ref.id}` };
+      return {
+        type: "AtBinding",
+        children: [ref],
+        ref
+      };
+    });
+    var NWBindingIdentifier$2 = Identifier;
+    var NWBindingIdentifier$3 = $TS($S(ReturnValue), function($skip, $loc, $0, $1) {
       return { children: [$1], names: [] };
     });
     function NWBindingIdentifier(state) {
@@ -7345,12 +7463,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("NWBindingIdentifier", state, NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state) || NWBindingIdentifier$2(state));
+        const result = $TOKEN("NWBindingIdentifier", state, NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state) || NWBindingIdentifier$2(state) || NWBindingIdentifier$3(state));
         if (state.events)
           state.events.exit?.("NWBindingIdentifier", state, result, eventData);
         return result;
       } else {
-        const result = NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state) || NWBindingIdentifier$2(state);
+        const result = NWBindingIdentifier$0(state) || NWBindingIdentifier$1(state) || NWBindingIdentifier$2(state) || NWBindingIdentifier$3(state);
         if (state.events)
           state.events.exit?.("NWBindingIdentifier", state, result, eventData);
         return result;
@@ -7358,11 +7476,7 @@ ${input.slice(result.pos)}
     }
     var AtIdentifierRef$0 = $TV(ReservedWord, function($skip, $loc, $0, $1) {
       var r = $0;
-      return {
-        type: "Ref",
-        base: `_${r}`,
-        id: r
-      };
+      return makeRef(`_${r}`, r);
     });
     var AtIdentifierRef$1 = $TV(IdentifierName, function($skip, $loc, $0, $1) {
       var id = $0;
@@ -7390,7 +7504,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($L17, fail, 'PinPattern "^"'), Identifier), function($skip, $loc, $0, $1, $2) {
       var identifier = $2;
       return {
         type: "PinPattern",
@@ -7763,7 +7877,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($L17, fail, 'BindingProperty "^"')), BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
       var ws = $1;
       var pin = $2;
       var binding = $3;
@@ -7908,7 +8022,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($L21, fail, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
       return {
         children: [{
           type: "ElisionElement",
@@ -8446,7 +8560,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($L22, fail, 'Arrow "->"'), $EXPECT($L23, fail, 'Arrow "\u2192"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "->" };
     });
     function Arrow(state) {
@@ -8976,7 +9090,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($L24, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
       const expressions = [];
       return {
         type: "BlockStatement",
@@ -9157,7 +9271,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($L25, fail, 'NullLiteral "null"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function NullLiteral(state) {
@@ -9185,7 +9299,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($L26, fail, 'BooleanLiteral "true"'), $EXPECT($L27, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function BooleanLiteral(state) {
@@ -9210,10 +9324,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($L28, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L29, 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($L30, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L31, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "false" };
     });
     function CoffeeScriptBooleanLiteral(state) {
@@ -9319,7 +9433,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($L32, fail, 'UpcomingAssignment ">"')))));
     function UpcomingAssignment(state) {
       let eventData;
       if (state.events) {
@@ -9583,7 +9697,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($L33, fail, 'ArrayElementDelimiter "]"')));
     var ArrayElementDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
       return value[1];
     });
@@ -10089,7 +10203,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($L24, fail, 'ObjectPropertyDelimiter "}"')));
     var ObjectPropertyDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
       return value[1];
     });
@@ -10261,7 +10375,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NamedProperty$0 = $TS($S(PropertyName, $E(_), Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var NamedProperty$0 = $TS($S(PropertyName, $E(_), Colon, PostfixedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
       var name = $1;
       var exp = $4;
       return {
@@ -10294,12 +10408,18 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SnugNamedProperty$0 = $TS($S(PropertyName, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
-      var exp = $3;
+    var SnugNamedProperty$0 = $TS($S(PropertyName, Colon, ExtendedExpression, $E($S($S($E(_), PostfixStatement), $Y($S(Nested, NamedProperty))))), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var name = $1;
+      var colon = $2;
+      var expression = $3;
+      var post = $4;
+      if (post) {
+        expression = attachPostfixStatementAsExpression(expression, post[0]);
+      }
       return {
         type: "Property",
-        children: $0,
-        names: exp.names || []
+        children: [name, colon, expression],
+        names: expression.names || []
       };
     });
     function SnugNamedProperty(state) {
@@ -10369,7 +10489,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($L18, fail, 'ComputedPropertyName "-"'), NumericLiteral, InsertCloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
       const expression = [$2, $3];
       return {
         type: "ComputedPropertyName",
@@ -10658,7 +10778,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PrivateIdentifier$0 = $TV($TEXT($S($EXPECT($L15, fail, 'PrivateIdentifier "#"'), IdentifierName)), function($skip, $loc, $0, $1) {
+    var PrivateIdentifier$0 = $TV($TEXT($S(Hash, IdentifierName)), function($skip, $loc, $0, $1) {
       return {
         type: "Identifier",
         name: $0,
@@ -10789,22 +10909,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($L34, fail, 'AssignmentOpSymbol "**="');
+    var AssignmentOpSymbol$1 = $EXPECT($L35, fail, 'AssignmentOpSymbol "*="');
+    var AssignmentOpSymbol$2 = $EXPECT($L36, fail, 'AssignmentOpSymbol "/="');
+    var AssignmentOpSymbol$3 = $EXPECT($L37, fail, 'AssignmentOpSymbol "%="');
+    var AssignmentOpSymbol$4 = $EXPECT($L38, fail, 'AssignmentOpSymbol "+="');
+    var AssignmentOpSymbol$5 = $EXPECT($L39, fail, 'AssignmentOpSymbol "-="');
+    var AssignmentOpSymbol$6 = $EXPECT($L40, fail, 'AssignmentOpSymbol "<<="');
+    var AssignmentOpSymbol$7 = $EXPECT($L41, fail, 'AssignmentOpSymbol ">>>="');
+    var AssignmentOpSymbol$8 = $EXPECT($L42, fail, 'AssignmentOpSymbol ">>="');
+    var AssignmentOpSymbol$9 = $EXPECT($L43, fail, 'AssignmentOpSymbol "&&="');
+    var AssignmentOpSymbol$10 = $EXPECT($L44, fail, 'AssignmentOpSymbol "&="');
+    var AssignmentOpSymbol$11 = $EXPECT($L45, fail, 'AssignmentOpSymbol "^="');
+    var AssignmentOpSymbol$12 = $EXPECT($L46, fail, 'AssignmentOpSymbol "||="');
+    var AssignmentOpSymbol$13 = $EXPECT($L47, fail, 'AssignmentOpSymbol "|="');
+    var AssignmentOpSymbol$14 = $EXPECT($L48, fail, 'AssignmentOpSymbol "??="');
+    var AssignmentOpSymbol$15 = $T($EXPECT($L49, fail, 'AssignmentOpSymbol "?="'), function(value) {
       return "??=";
     });
     var AssignmentOpSymbol$16 = $T($S($EXPECT($L3, fail, 'AssignmentOpSymbol "="'), $N($EXPECT($L3, fail, 'AssignmentOpSymbol "="'))), function(value) {
@@ -10835,10 +10955,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeWordAssignmentOp$0 = $T($EXPECT($L52, fail, 'CoffeeWordAssignmentOp "and="'), function(value) {
+    var CoffeeWordAssignmentOp$0 = $T($EXPECT($L50, fail, 'CoffeeWordAssignmentOp "and="'), function(value) {
       return "&&=";
     });
-    var CoffeeWordAssignmentOp$1 = $T($EXPECT($L53, fail, 'CoffeeWordAssignmentOp "or="'), function(value) {
+    var CoffeeWordAssignmentOp$1 = $T($EXPECT($L51, fail, 'CoffeeWordAssignmentOp "or="'), function(value) {
       return "||=";
     });
     function CoffeeWordAssignmentOp(state) {
@@ -10945,27 +11065,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($L52, fail, 'BinaryOpSymbol "**"');
+    var BinaryOpSymbol$1 = $EXPECT($L53, fail, 'BinaryOpSymbol "*"');
+    var BinaryOpSymbol$2 = $EXPECT($L54, fail, 'BinaryOpSymbol "/"');
+    var BinaryOpSymbol$3 = $TV($EXPECT($L55, 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($L56, fail, 'BinaryOpSymbol "%"');
+    var BinaryOpSymbol$5 = $EXPECT($L57, fail, 'BinaryOpSymbol "+"');
+    var BinaryOpSymbol$6 = $EXPECT($L18, fail, 'BinaryOpSymbol "-"');
+    var BinaryOpSymbol$7 = $EXPECT($L58, fail, 'BinaryOpSymbol "<="');
+    var BinaryOpSymbol$8 = $T($EXPECT($L59, 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($L60, fail, 'BinaryOpSymbol ">="');
+    var BinaryOpSymbol$10 = $T($EXPECT($L61, fail, 'BinaryOpSymbol "\u2265"'), function(value) {
       return ">=";
     });
-    var BinaryOpSymbol$11 = $TV($EXPECT($L64, fail, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
+    var BinaryOpSymbol$11 = $TV($EXPECT($L62, fail, 'BinaryOpSymbol "<?"'), function($skip, $loc, $0, $1) {
       return {
         $loc,
         token: "instanceof",
@@ -10973,7 +11093,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($L63, fail, 'BinaryOpSymbol "!<?"'), function($skip, $loc, $0, $1) {
       return {
         $loc,
         token: "instanceof",
@@ -10982,79 +11102,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($L64, fail, 'BinaryOpSymbol "<<"');
+    var BinaryOpSymbol$14 = $T($EXPECT($L65, 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($L66, fail, 'BinaryOpSymbol ">>>"');
+    var BinaryOpSymbol$17 = $T($EXPECT($L67, 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($L68, fail, 'BinaryOpSymbol ">>"');
+    var BinaryOpSymbol$19 = $T($EXPECT($L69, 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($L32, fail, 'BinaryOpSymbol ">"');
+    var BinaryOpSymbol$21 = $EXPECT($L70, fail, 'BinaryOpSymbol "!=="');
+    var BinaryOpSymbol$22 = $T($EXPECT($L71, 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($L72, fail, 'BinaryOpSymbol "!="'), $EXPECT($L73, 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($L74, 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($L75, fail, 'BinaryOpSymbol "==="');
+    var BinaryOpSymbol$26 = $T($C($EXPECT($L76, fail, 'BinaryOpSymbol "\u2263"'), $EXPECT($L77, 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($L78, fail, 'BinaryOpSymbol "=="'), $EXPECT($L79, fail, 'BinaryOpSymbol "\u2261"'), $EXPECT($L80, 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($L81, 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($L82, fail, 'BinaryOpSymbol "&&"');
+    var BinaryOpSymbol$30 = $T($S(CoffeeOfEnabled, $EXPECT($L83, 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($L84, 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($L85, fail, 'BinaryOpSymbol "||"');
+    var BinaryOpSymbol$33 = $T($EXPECT($L86, 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($L87, fail, 'BinaryOpSymbol "^^"'), $S($EXPECT($L88, 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($L89, 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($L90, fail, 'BinaryOpSymbol "??"');
+    var BinaryOpSymbol$37 = $T($EXPECT($L91, 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($L92, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return {
         $loc,
         token: $1,
@@ -11062,7 +11182,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($L92, fail, 'BinaryOpSymbol "instanceof"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3, $4) {
       return {
         $loc,
         token: "instanceof",
@@ -11071,7 +11191,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($L83, fail, 'BinaryOpSymbol "of"'), NonIdContinue)), function($skip, $loc, $0, $1) {
       return {
         $loc,
         token: "in",
@@ -11079,7 +11199,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($L93, fail, 'BinaryOpSymbol "\u2208"')), function($skip, $loc, $0, $1) {
       return {
         method: "includes",
         relational: true,
@@ -11087,14 +11207,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($L94, 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($L95, fail, 'BinaryOpSymbol "\u220C"'), function($skip, $loc, $0, $1) {
       return {
         method: "includes",
         relational: true,
@@ -11111,7 +11231,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($L96, fail, 'BinaryOpSymbol "\u2209"')), function($skip, $loc, $0, $1) {
       return {
         method: "includes",
         relational: true,
@@ -11155,9 +11275,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($L97, fail, 'BinaryOpSymbol "&"');
+    var BinaryOpSymbol$52 = $EXPECT($L17, fail, 'BinaryOpSymbol "^"');
+    var BinaryOpSymbol$53 = $EXPECT($L98, fail, 'BinaryOpSymbol "|"');
     function BinaryOpSymbol(state) {
       let eventData;
       if (state.events) {
@@ -11180,8 +11300,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($L87, fail, 'Xor "^^"');
+    var Xor$1 = $S($EXPECT($L88, fail, 'Xor "xor"'), NonIdContinue);
     function Xor(state) {
       let eventData;
       if (state.events) {
@@ -11205,7 +11325,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($L89, fail, 'Xnor "xnor"');
     function Xnor(state) {
       let eventData;
       if (state.events) {
@@ -11493,7 +11613,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($L99, fail, 'EmptyStatement ";"'))), function($skip, $loc, $0, $1, $2) {
       return { type: "EmptyStatement", children: $1 || [] };
     });
     function EmptyStatement(state) {
@@ -11572,7 +11692,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($L100, fail, 'Label "$:"'), Whitespace);
     function Label(state) {
       let eventData;
       if (state.events) {
@@ -12050,6 +12170,7 @@ ${input.slice(result.pos)}
         subtype: statement.type,
         children: [statement],
         block: statement.block,
+        statement,
         async
       };
     });
@@ -12416,7 +12537,7 @@ ${input.slice(result.pos)}
         }
         if (declaration.own) {
           const hasPropRef = module.getRef("hasProp");
-          blockPrefix.push(["", "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue", ";"]);
+          blockPrefix.push(["", "if (!", hasPropRef, "(", exp, ", ", declaration, ")) continue", ";"]);
         }
         if (index) {
           blockPrefix.push(["", {
@@ -12541,7 +12662,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(__, Own)), ForBinding), function($skip, $loc, $0, $1, $2) {
       var own = $1;
       var binding = $2;
       return {
@@ -12587,11 +12708,11 @@ ${input.slice(result.pos)}
         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$2 = $TS($S($E($S(Await, __)), $E($S($C(Each, Own), __)), $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, module.getRef);
     });
-    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$3 = $TS($S($E($S(Await, __)), $E($S($C(Each, Own), __)), 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, module.getRef);
     });
     var ForStatementParameters$4 = ForRangeParameters;
     function ForStatementParameters(state) {
@@ -14170,7 +14291,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($L101, fail, 'Break "break"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Break(state) {
@@ -14195,7 +14316,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($L102, fail, 'Continue "continue"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Continue(state) {
@@ -14220,7 +14341,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($L103, fail, 'Debugger "debugger"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Debugger(state) {
@@ -14526,7 +14647,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($L104, fail, 'ImportAssertion "assert"'), NonIdContinue, $E(_), ObjectLiteral);
     function ImportAssertion(state) {
       let eventData;
       if (state.events) {
@@ -15096,7 +15217,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($L105, fail, 'ConstAssignment ":="'), $EXPECT($L106, fail, 'ConstAssignment "\u2254"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function ConstAssignment(state) {
@@ -15121,7 +15242,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($L107, fail, 'LetAssignment ".="'), function($skip, $loc, $0, $1) {
       return { $loc, token: "=" };
     });
     function LetAssignment(state) {
@@ -15767,7 +15888,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($L54, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L54, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
       return { type: "RegularExpressionLiteral", $loc, token: $1 };
     });
     function RegularExpressionLiteral(state) {
@@ -16334,7 +16455,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($L108, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L109, fail, 'JSMultiLineComment "*/"')), $EXPECT($R42, fail, "JSMultiLineComment /./"))), $EXPECT($L109, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { type: "Comment", $loc, token: $1 };
     });
     function JSMultiLineComment(state) {
@@ -16433,7 +16554,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($L108, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L109, fail, 'InlineComment "*/"')), $EXPECT($R46, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L109, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function InlineComment(state) {
@@ -16530,7 +16651,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($L110, fail, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
       return "";
     });
     function NonNewlineWhitespace(state) {
@@ -16682,7 +16803,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($L111, fail, 'StatementDelimiter "["'), $EXPECT($L112, fail, 'StatementDelimiter "`"'), $EXPECT($L57, fail, 'StatementDelimiter "+"'), $EXPECT($L18, fail, 'StatementDelimiter "-"'), $EXPECT($L53, fail, 'StatementDelimiter "*"'), $EXPECT($L54, 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;
@@ -16782,7 +16903,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($L113, fail, 'Abstract "abstract"'), NonIdContinue, $E($EXPECT($L11, fail, 'Abstract " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1, ts: true };
     });
     function Abstract(state) {
@@ -16807,7 +16928,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($L97, fail, 'Ampersand "&"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Ampersand(state) {
@@ -16832,7 +16953,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($L114, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function As(state) {
@@ -16857,7 +16978,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($L115, fail, 'At "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function At(state) {
@@ -16882,7 +17003,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($L116, fail, 'AtAt "@@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "@" };
     });
     function AtAt(state) {
@@ -16907,7 +17028,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($L117, fail, 'Async "async"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "Async" };
     });
     function Async(state) {
@@ -16932,7 +17053,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($L118, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "Await" };
     });
     function Await(state) {
@@ -16957,7 +17078,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($L112, fail, 'Backtick "`"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Backtick(state) {
@@ -16982,7 +17103,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($L119, fail, 'By "by"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function By(state) {
@@ -17007,7 +17128,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($L120, fail, 'Case "case"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Case(state) {
@@ -17032,7 +17153,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($L121, fail, 'Catch "catch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Catch(state) {
@@ -17057,7 +17178,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($L122, fail, 'Class "class"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Class(state) {
@@ -17082,7 +17203,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($L24, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseBrace(state) {
@@ -17107,7 +17228,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($L33, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseBracket(state) {
@@ -17132,7 +17253,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($L123, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseParen(state) {
@@ -17157,7 +17278,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($L124, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "${" };
     });
     function CoffeeSubstitutionStart(state) {
@@ -17207,7 +17328,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($L21, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Comma(state) {
@@ -17232,7 +17353,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($L115, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "constructor" };
     });
     function ConstructorShorthand(state) {
@@ -17257,7 +17378,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($L125, fail, 'Declare "declare"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Declare(state) {
@@ -17282,7 +17403,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($L126, fail, 'Default "default"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Default(state) {
@@ -17307,7 +17428,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($L127, fail, 'Delete "delete"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Delete(state) {
@@ -17332,7 +17453,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($L128, fail, 'Do "do"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Do(state) {
@@ -17389,10 +17510,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($L129, 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($L130, fail, 'DotDot "\u2025"'), function($skip, $loc, $0, $1) {
       return { $loc, token: ".." };
     });
     function DotDot(state) {
@@ -17417,10 +17538,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($L131, 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($L132, fail, 'DotDotDot "\u2026"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "..." };
     });
     function DotDotDot(state) {
@@ -17445,7 +17566,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($L133, fail, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleColon(state) {
@@ -17470,7 +17591,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($L134, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function DoubleQuote(state) {
@@ -17495,7 +17616,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Each$0 = $TS($S($EXPECT($L138, fail, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Each$0 = $TS($S($EXPECT($L135, fail, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Each(state) {
@@ -17520,7 +17641,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Else$0 = $TS($S($EXPECT($L139, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Else$0 = $TS($S($EXPECT($L136, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Else(state) {
@@ -17570,7 +17691,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Export$0 = $TS($S($EXPECT($L140, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Export$0 = $TS($S($EXPECT($L137, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Export(state) {
@@ -17595,7 +17716,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Extends$0 = $TS($S($EXPECT($L141, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Extends$0 = $TS($S($EXPECT($L138, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Extends(state) {
@@ -17620,7 +17741,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Finally$0 = $TS($S($EXPECT($L142, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Finally$0 = $TS($S($EXPECT($L139, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Finally(state) {
@@ -17645,7 +17766,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var For$0 = $TS($S($EXPECT($L143, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var For$0 = $TS($S($EXPECT($L140, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function For(state) {
@@ -17670,7 +17791,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var From$0 = $TS($S($EXPECT($L144, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var From$0 = $TS($S($EXPECT($L141, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function From(state) {
@@ -17695,7 +17816,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Function$0 = $TS($S($EXPECT($L145, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Function$0 = $TS($S($EXPECT($L142, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Function(state) {
@@ -17720,7 +17841,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var GetOrSet$0 = $TS($S($C($EXPECT($L146, fail, 'GetOrSet "get"'), $EXPECT($L147, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var GetOrSet$0 = $TS($S($C($EXPECT($L143, fail, 'GetOrSet "get"'), $EXPECT($L144, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "GetOrSet" };
     });
     function GetOrSet(state) {
@@ -17745,7 +17866,32 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var If$0 = $TV($TEXT($S($EXPECT($L148, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L11, fail, 'If " "')))), function($skip, $loc, $0, $1) {
+    var Hash$0 = $TV($EXPECT($L145, fail, 'Hash "#"'), function($skip, $loc, $0, $1) {
+      return { $loc, token: $1 };
+    });
+    function Hash(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("Hash", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("Hash", state, Hash$0(state));
+        if (state.events)
+          state.events.exit?.("Hash", state, result, eventData);
+        return result;
+      } else {
+        const result = Hash$0(state);
+        if (state.events)
+          state.events.exit?.("Hash", state, result, eventData);
+        return result;
+      }
+    }
+    var If$0 = $TV($TEXT($S($EXPECT($L146, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L11, fail, 'If " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function If(state) {
@@ -17770,7 +17916,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($L15, fail, 'Import "import"'), $Y($EXPECT($R50, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Import(state) {
@@ -17795,7 +17941,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var In$0 = $TS($S($EXPECT($L149, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var In$0 = $TS($S($EXPECT($L147, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function In(state) {
@@ -17820,7 +17966,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetOrConst$0 = $TS($S($C($EXPECT($L150, fail, 'LetOrConst "let"'), $EXPECT($L151, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var LetOrConst$0 = $TS($S($C($EXPECT($L148, fail, 'LetOrConst "let"'), $EXPECT($L149, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function LetOrConst(state) {
@@ -17845,7 +17991,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Const$0 = $TS($S($EXPECT($L151, fail, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Const$0 = $TS($S($EXPECT($L149, fail, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Const(state) {
@@ -17870,7 +18016,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Is$0 = $TS($S($EXPECT($L152, fail, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Is$0 = $TS($S($EXPECT($L150, fail, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Is(state) {
@@ -17919,7 +18065,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Loop$0 = $TS($S($EXPECT($L153, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Loop$0 = $TS($S($EXPECT($L151, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "while(true)" };
     });
     function Loop(state) {
@@ -17944,7 +18090,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var New$0 = $TS($S($EXPECT($L154, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var New$0 = $TS($S($EXPECT($L152, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function New(state) {
@@ -17969,7 +18115,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    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) {
+    var Not$0 = $TS($S($EXPECT($L153, fail, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L12, fail, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
       return { $loc, token: "!" };
     });
     function Not(state) {
@@ -17994,7 +18140,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($L83, fail, 'Of "of"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Of(state) {
@@ -18019,7 +18165,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenAngleBracket$0 = $TV($EXPECT($L156, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+    var OpenAngleBracket$0 = $TV($EXPECT($L154, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenAngleBracket(state) {
@@ -18069,7 +18215,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($L111, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenBracket(state) {
@@ -18119,7 +18265,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Operator$0 = $TS($S($EXPECT($L157, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Operator$0 = $TS($S($EXPECT($L155, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Operator(state) {
@@ -18144,7 +18290,32 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Public$0 = $TS($S($EXPECT($L158, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Own$0 = $TS($S($EXPECT($L156, fail, 'Own "own"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      return { $loc, token: $1 };
+    });
+    function Own(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("Own", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("Own", state, Own$0(state));
+        if (state.events)
+          state.events.exit?.("Own", state, result, eventData);
+        return result;
+      } else {
+        const result = Own$0(state);
+        if (state.events)
+          state.events.exit?.("Own", state, result, eventData);
+        return result;
+      }
+    }
+    var Public$0 = $TS($S($EXPECT($L157, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Public(state) {
@@ -18169,7 +18340,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Private$0 = $TS($S($EXPECT($L159, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Private$0 = $TS($S($EXPECT($L158, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Private(state) {
@@ -18194,7 +18365,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Protected$0 = $TS($S($EXPECT($L160, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Protected$0 = $TS($S($EXPECT($L159, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Protected(state) {
@@ -18219,13 +18390,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Pipe$0 = $TV($C($EXPECT($L161, fail, 'Pipe "||>"'), $EXPECT($L162, fail, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
+    var Pipe$0 = $TV($C($EXPECT($L160, fail, 'Pipe "||>"'), $EXPECT($L161, fail, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "||>" };
     });
-    var Pipe$1 = $TV($C($EXPECT($L163, fail, 'Pipe "|>="'), $EXPECT($L164, fail, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
+    var Pipe$1 = $TV($C($EXPECT($L162, fail, 'Pipe "|>="'), $EXPECT($L163, fail, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
       return { $loc, token: "|>=" };
     });
-    var Pipe$2 = $TV($C($EXPECT($L165, fail, 'Pipe "|>"'), $EXPECT($L166, fail, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
+    var Pipe$2 = $TV($C($EXPECT($L164, fail, 'Pipe "|>"'), $EXPECT($L165, fail, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "|>" };
     });
     function Pipe(state) {
@@ -18275,7 +18446,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Readonly$0 = $TS($S($EXPECT($L167, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Readonly$0 = $TS($S($EXPECT($L166, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, ts: true };
     });
     function Readonly(state) {
@@ -18300,7 +18471,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Return$0 = $TS($S($EXPECT($L168, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Return$0 = $TS($S($EXPECT($L167, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Return(state) {
@@ -18325,7 +18496,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Satisfies$0 = $TS($S($EXPECT($L169, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Satisfies$0 = $TS($S($EXPECT($L168, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Satisfies(state) {
@@ -18350,7 +18521,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($L99, fail, 'Semicolon ";"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Semicolon(state) {
@@ -18375,7 +18546,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleQuote$0 = $TV($EXPECT($L170, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+    var SingleQuote$0 = $TV($EXPECT($L169, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SingleQuote(state) {
@@ -18400,7 +18571,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($L53, fail, 'Star "*"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Star(state) {
@@ -18425,10 +18596,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Static$0 = $TS($S($EXPECT($L171, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    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($L115, fail, 'Static "@"'), $N($C($EXPECT($L4, fail, 'Static "("'), $EXPECT($L115, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "static " };
     });
     function Static(state) {
@@ -18453,7 +18624,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SubstitutionStart$0 = $TV($EXPECT($L172, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+    var SubstitutionStart$0 = $TV($EXPECT($L171, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SubstitutionStart(state) {
@@ -18478,6 +18649,31 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    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 };
     });
@@ -19048,7 +19244,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    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) {
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L154, 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) {
@@ -19124,7 +19320,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L156, fail, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L34, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L154, fail, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L32, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       let eventData;
       if (state.events) {
@@ -19176,7 +19372,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingElement$0 = $S($EXPECT($L192, 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($L32, fail, 'JSXClosingElement ">"'));
     function JSXClosingElement(state) {
       let eventData;
       if (state.events) {
@@ -19322,7 +19518,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXElementName$0 = $TV($Y($S($C($EXPECT($L15, fail, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
+    var JSXElementName$0 = $TV($Y($S($C($EXPECT($L145, fail, 'JSXElementName "#"'), Dot), JSXShorthandString)), function($skip, $loc, $0, $1) {
       return module.config.defaultElement;
     });
     var JSXElementName$1 = $TEXT($S(JSXIdentifierName, $C($S(Colon, JSXIdentifierName), $Q($S(Dot, JSXIdentifierName)))));
@@ -19549,7 +19745,7 @@ ${input.slice(result.pos)}
       }
       return $skip;
     });
-    var JSXAttribute$5 = $TS($S($EXPECT($L15, fail, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+    var JSXAttribute$5 = $TS($S($EXPECT($L145, fail, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
       return [" ", "id=", $2];
     });
     var JSXAttribute$6 = $TS($S(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
@@ -19879,7 +20075,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({
@@ -19891,7 +20087,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($L15, fail, 'InlineJSXCallExpression "import"'), ExplicitArguments, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
       var args = $2;
       var rest = $3;
       return processCallMemberExpression({
@@ -20139,7 +20335,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($L24, fail, 'JSXNestedChildren "}"'), JSXClosingElement, JSXClosingFragment)), function($skip, $loc, $0, $1) {
       return { children: [], jsxChildren: [] };
     });
     function JSXNestedChildren(state) {
@@ -21456,7 +21652,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L152, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L150, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
       var lhs = $1;
       var rhs = $2;
       if (!rhs)
@@ -21601,7 +21797,7 @@ ${input.slice(result.pos)}
     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);
+    var TypeUnaryOp$3 = $S($EXPECT($L166, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
     function TypeUnaryOp(state) {
       let eventData;
       if (state.events) {
@@ -21692,8 +21888,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($L15, fail, 'ImportType "import"'), OpenParen, __, StringLiteral, __, CloseParen, $E($S(Dot, IdentifierName)), $E(TypeArguments));
+    var ImportType$1 = $S($EXPECT($L15, fail, 'ImportType "import"'), InsertOpenParen, Trimmed_, StringLiteral, InsertCloseParen);
     function ImportType(state) {
       let eventData;
       if (state.events) {
@@ -21864,7 +22060,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    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) {
+    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L138, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
       if ($2)
         return $0;
       return $1;
@@ -22074,7 +22270,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($L123, fail, 'InlineInterfacePropertyDelimiter ")"'), $EXPECT($L33, fail, 'InlineInterfacePropertyDelimiter "]"'), $EXPECT($L24, fail, 'InlineInterfacePropertyDelimiter "}"'))));
     var InlineInterfacePropertyDelimiter$3 = $Y(EOS);
     function InlineInterfacePropertyDelimiter(state) {
       let eventData;
@@ -22098,10 +22294,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($L98, 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($L97, fail, 'TypeBinaryOp "&"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "&" };
     });
     function TypeBinaryOp(state) {
@@ -22155,7 +22351,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($L22, fail, 'TypeArrowFunction "->"'), $EXPECT($L23, fail, 'TypeArrowFunction "\u2192"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "=>" };
     });
     function TypeArrowFunction(state) {
@@ -22180,7 +22376,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeArguments$0 = $TS($S($EXPECT($L156, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L34, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var TypeArguments$0 = $TS($S($EXPECT($L154, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L32, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       var args = $2;
       return { ts: true, types: args.map(([, t]) => t), children: $0 };
     });
@@ -22252,7 +22448,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    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 TypeParameters$0 = $TS($S($E(_), $EXPECT($L154, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L32, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var parameters = $3;
       return {
         type: "TypeParameters",
@@ -22283,7 +22479,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameter$0 = $S(__, $E($S($EXPECT($L151, fail, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
+    var TypeParameter$0 = $S(__, $E($S($EXPECT($L149, fail, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
     function TypeParameter(state) {
       let eventData;
       if (state.events) {
@@ -22306,7 +22502,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConstraint$0 = $S(__, $EXPECT($L141, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
+    var TypeConstraint$0 = $S(__, $EXPECT($L138, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
     function TypeConstraint(state) {
       let eventData;
       if (state.events) {
@@ -22353,7 +22549,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($L32, fail, 'TypeParameterDelimiter ">"')));
     var TypeParameterDelimiter$2 = $T($S($Y(EOS), InsertComma), function(value) {
       return value[1];
     });
@@ -23625,9 +23821,9 @@ ${input.slice(result.pos)}
         hasProp(hasPropRef) {
           const typeSuffix = {
             ts: true,
-            children: [": <T>(this: T, prop: keyof T) => boolean"]
+            children: [": <T>(object: T, prop: keyof T) => boolean"]
           };
-          module.prelude.push(["", [preludeVar, hasPropRef, typeSuffix, " = {}.hasOwnProperty", asAny, ";\n"]]);
+          module.prelude.push(["", [preludeVar, hasPropRef, typeSuffix, " = {}.constructor.hasOwn", asAny, ";\n"]]);
         },
         is(isRef) {
           const typeSuffix = {