@danielx/civet 0.6.19 → 0.6.21

package/dist/main.mjs

@@ -341,11 +341,7 @@ var require_lib = __commonJS({
         exp.children.splice(i, 1, ...wrapIIFE(exp.children, exp.async));
         return;
       }
-      const resultsRef = {
-        type: "Ref",
-        base: "results",
-        id: "results"
-      };
+      const resultsRef = makeRef("results");
       insertPush(exp.block, resultsRef);
       exp.children.splice(
         i,
@@ -423,10 +419,7 @@ var require_lib = __commonJS({
           const parts = [];
           let hoistDec, refAssignment;
           if (prefix.length > 1) {
-            const ref = {
-              type: "Ref",
-              base: "ref"
-            };
+            const ref = makeRef();
             hoistDec = {
               type: "Declaration",
               children: ["let ", ref],
@@ -528,11 +521,7 @@ var require_lib = __commonJS({
         }
         return;
       }
-      const resultsRef = {
-        type: "Ref",
-        base: "results",
-        id: "results"
-      };
+      const resultsRef = makeRef("results");
       const declaration = {
         type: "Declaration",
         children: ["const ", resultsRef, "=[];"]
@@ -1037,13 +1026,123 @@ var require_lib = __commonJS({
       if (target.token)
         return target.token.match(/^ ?/)[0];
     }
+    function processForInOf($0) {
+      let [awaits, each, open, declaration, declaration2, ws, inOf, exp, step, close] = $0;
+      if (exp.type === "RangeExpression" && inOf.token === "of" && !declaration2) {
+        return forRange(open, declaration, exp, step, close);
+      } else if (step) {
+        throw new Error("for..of/in cannot use 'by' except with range literals");
+      }
+      let eachError;
+      let hoistDec, blockPrefix = [];
+      if (each) {
+        if (inOf.token === "of") {
+          const counterRef = makeRef("i");
+          const lenRef = makeRef("len");
+          const expRef = maybeRef(exp);
+          const increment = "++";
+          let indexAssignment, assignmentNames = [...declaration.names];
+          if (declaration2) {
+            const [, , ws22, decl22] = declaration2;
+            blockPrefix.push(["", [
+              insertTrimmingSpace(ws22, ""),
+              decl22,
+              " = ",
+              counterRef
+            ], ";"]);
+            assignmentNames.push(...decl22.names);
+          }
+          const expRefDec = expRef !== exp ? [insertTrimmingSpace(expRef, " "), " = ", insertTrimmingSpace(exp, ""), ", "] : [];
+          blockPrefix.push(["", {
+            type: "AssignmentExpression",
+            children: [declaration, " = ", insertTrimmingSpace(expRef, ""), "[", counterRef, "]"],
+            names: assignmentNames
+          }, ";"]);
+          declaration = {
+            type: "Declaration",
+            children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", insertTrimmingSpace(expRef, ""), ".length"],
+            names: []
+          };
+          const condition = [counterRef, " < ", lenRef, "; "];
+          const children = [open, declaration, "; ", condition, counterRef, increment, close];
+          return { declaration, children, blockPrefix };
+        } else {
+          eachError = {
+            type: "Error",
+            message: "'each' is only meaningful in for..of loops"
+          };
+        }
+      }
+      if (!declaration2) {
+        return {
+          declaration,
+          children: [awaits, eachError, open, declaration, ws, inOf, exp, step, close]
+        };
+      }
+      const [, , ws2, decl2] = declaration2;
+      switch (inOf.token) {
+        case "of": {
+          const counterRef = makeRef("i");
+          hoistDec = {
+            type: "Declaration",
+            children: ["let ", counterRef, " = 0"],
+            names: []
+          };
+          blockPrefix.push(["", {
+            type: "Declaration",
+            children: [insertTrimmingSpace(ws2, ""), decl2, " = ", counterRef, "++"],
+            names: decl2.names
+          }, ";"]);
+          break;
+        }
+        case "in": {
+          const expRef = maybeRef(exp);
+          if (expRef !== exp) {
+            hoistDec = {
+              type: "Declaration",
+              children: ["let ", expRef],
+              names: []
+            };
+            exp = {
+              type: "AssignmentExpression",
+              children: [" ", expRef, " =", exp]
+            };
+          }
+          let { binding } = declaration;
+          if (binding?.type !== "Identifier") {
+            const keyRef = makeRef("key");
+            blockPrefix.push(["", [
+              declaration,
+              " = ",
+              keyRef
+            ], ";"]);
+            declaration = {
+              type: "ForDeclaration",
+              binding: binding = keyRef,
+              children: ["const ", keyRef],
+              names: []
+            };
+          }
+          blockPrefix.push(["", {
+            type: "Declaration",
+            children: [insertTrimmingSpace(ws2, ""), decl2, " = ", insertTrimmingSpace(expRef, ""), "[", insertTrimmingSpace(binding, ""), "]"],
+            names: decl2.names
+          }, ";"]);
+          break;
+        }
+        default:
+          throw new Error(`for item, index must use 'of' or 'in' instead of '${inOf.token}'`);
+      }
+      return {
+        declaration,
+        children: [awaits, eachError, open, declaration, ws, inOf, exp, step, close],
+        blockPrefix,
+        hoistDec
+      };
+    }
     function forRange(open, forDeclaration, range, stepExp, close) {
       const { start, end, inclusive } = range;
-      const counterRef = {
-        type: "Ref",
-        base: "i",
-        id: "i"
-      };
+      const counterRef = makeRef("i");
       let stepRef;
       if (stepExp) {
         stepExp = insertTrimmingSpace(stepExp, "");
@@ -1061,11 +1160,7 @@ var require_lib = __commonJS({
       } else if (start.type === "Literal" && end.type === "Literal") {
         asc = literalValue(start) <= literalValue(end);
       } else {
-        ascRef = {
-          type: "Ref",
-          base: "asc",
-          id: "asc"
-        };
+        ascRef = makeRef("asc");
         ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
       }
       let varAssign = [], varLetAssign = varAssign, varLet = varAssign, blockPrefix;
@@ -1205,15 +1300,6 @@ var require_lib = __commonJS({
           };
       }
     }
-    function maybeRef(exp, base = "ref") {
-      if (!needsRef(exp))
-        return exp;
-      return {
-        type: "Ref",
-        base,
-        id: base
-      };
-    }
     function modifyString(str) {
       return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
     }
@@ -1309,13 +1395,20 @@ var require_lib = __commonJS({
         case "Identifier":
         case "Literal":
           return;
-        default:
-          return {
-            type: "Ref",
-            base,
-            id: base
-          };
       }
+      return makeRef(base);
+    }
+    function makeRef(base = "ref") {
+      return {
+        type: "Ref",
+        base,
+        id: base
+      };
+    }
+    function maybeRef(exp, base = "ref") {
+      if (!needsRef(exp))
+        return exp;
+      return makeRef(base);
     }
     function processCoffeeInterpolation(s, parts, e, $loc) {
       if (parts.length === 0 || parts.length === 1 && parts[0].token != null) {
@@ -1808,11 +1901,7 @@ var require_lib = __commonJS({
         if (shared.length === 1)
           return;
         const refs = shared.map((p) => {
-          const ref = {
-            type: "Ref",
-            base: key,
-            id: key
-          };
+          const ref = makeRef(key);
           aliasBinding(p, ref);
           return ref;
         });
@@ -1846,7 +1935,7 @@ var require_lib = __commonJS({
         if (expression.type === "ParenthesizedExpression") {
           expression = expression.expression;
         }
-        let hoistDec, refAssignment = [], ref = needsRef(expression, "m") || expression;
+        let hoistDec, refAssignment = [], ref = maybeRef(expression, "m");
         if (ref !== expression) {
           hoistDec = {
             type: "Declaration",
@@ -1972,7 +2061,7 @@ var require_lib = __commonJS({
                         arg.children.push(access);
                         break outer;
                     }
-                    usingRef = needsRef({});
+                    usingRef = makeRef();
                     initRef = {
                       type: "AssignmentExpression",
                       children: [usingRef, " = ", arg, ","]
@@ -2062,10 +2151,11 @@ var require_lib = __commonJS({
       });
     }
     function processProgram(root, config, m, ReservedWord) {
+      assert.equal(m.forbidBracedApplication.length, 1, "forbidBracedApplication");
       assert.equal(m.forbidClassImplicitCall.length, 1, "forbidClassImplicitCall");
       assert.equal(m.forbidIndentedApplication.length, 1, "forbidIndentedApplication");
+      assert.equal(m.forbidNewlineBinaryOp.length, 1, "forbidNewlineBinaryOp");
       assert.equal(m.forbidTrailingMemberProperty.length, 1, "forbidTrailingMemberProperty");
-      assert.equal(m.forbidMultiLineImplicitObjectLiteral.length, 1, "forbidMultiLineImplicitObjectLiteral");
       assert.equal(m.JSXTagStack.length, 0, "JSXTagStack should be empty");
       addParentPointers(root);
       const { expressions: statements } = root;
@@ -2246,11 +2336,7 @@ var require_lib = __commonJS({
       );
       if (!values.length)
         return false;
-      const ref = {
-        type: "Ref",
-        base: "ret",
-        id: "ret"
-      };
+      const ref = makeRef("ret");
       let declared;
       values.forEach((value) => {
         value.children = [ref];
@@ -2579,13 +2665,15 @@ var require_lib = __commonJS({
       makeAsConst,
       makeEmptyBlock,
       makeLeftHandSideExpression,
+      makeRef,
       maybeRef,
       modifyString,
       needsRef,
+      processAssignmentDeclaration,
       processBinaryOpExpression,
       processCallMemberExpression,
       processCoffeeInterpolation,
-      processAssignmentDeclaration,
+      processForInOf,
       processParams,
       processProgram,
       processReturnValue,
@@ -3189,10 +3277,8 @@ ${input.slice(result.pos)}
       InlineObjectLiteral,
       ImplicitInlineObjectPropertyDelimiter,
       ObjectPropertyDelimiter,
-      PropertyDefinitionList,
       PropertyDefinition,
       NamedProperty,
-      ImplicitNamedProperty,
       SnugNamedProperty,
       PropertyName,
       ComputedPropertyName,
@@ -3298,10 +3384,6 @@ ${input.slice(result.pos)}
       AllowTrailingMemberProperty,
       RestoreTrailingMemberProperty,
       TrailingMemberPropertyAllowed,
-      ForbidMultiLineImplicitObjectLiteral,
-      AllowMultiLineImplicitObjectLiteral,
-      RestoreMultiLineImplicitObjectLiteral,
-      MultiLineImplicitObjectLiteralAllowed,
       AllowNewlineBinaryOp,
       ForbidNewlineBinaryOp,
       RestoreNewlineBinaryOp,
@@ -3432,6 +3514,7 @@ ${input.slice(result.pos)}
       DotDotDot,
       DoubleColon,
       DoubleQuote,
+      Each,
       Else,
       Equals,
       Export,
@@ -3535,6 +3618,7 @@ ${input.slice(result.pos)}
       NestedJSXChildExpression,
       TypeDeclaration,
       TypeDeclarationRest,
+      OptionalEquals,
       TypeLexicalDeclaration,
       TypeDeclarationBinding,
       InterfaceExtendsClause,
@@ -3623,6 +3707,7 @@ ${input.slice(result.pos)}
       InsertOpenBracket,
       InsertCloseBracket,
       InsertComma,
+      InsertSpaceEquals,
       InsertConst,
       InsertLet,
       InsertReadonly,
@@ -3650,13 +3735,13 @@ ${input.slice(result.pos)}
       Init,
       Indent,
       TrackIndented,
-      Samedent,
-      IndentedFurther,
-      NotDedented,
-      Dedented,
       PushIndent,
       PopIndent,
-      Nested
+      Nested,
+      IndentedFurther,
+      IndentedAtLeast,
+      NotDedented,
+      Dedented
     });
     var $L0 = $L("");
     var $L1 = $L("{");
@@ -3796,75 +3881,76 @@ ${input.slice(result.pos)}
     var $L135 = $L("\u2026");
     var $L136 = $L("::");
     var $L137 = $L('"');
-    var $L138 = $L("else");
-    var $L139 = $L("export");
-    var $L140 = $L("extends");
-    var $L141 = $L("finally");
-    var $L142 = $L("for");
-    var $L143 = $L("from");
-    var $L144 = $L("function");
-    var $L145 = $L("get");
-    var $L146 = $L("set");
-    var $L147 = $L("if");
-    var $L148 = $L("in");
-    var $L149 = $L("let");
-    var $L150 = $L("const");
-    var $L151 = $L("is");
-    var $L152 = $L("loop");
-    var $L153 = $L("new");
-    var $L154 = $L("not");
-    var $L155 = $L("<");
-    var $L156 = $L("operator");
-    var $L157 = $L("public");
-    var $L158 = $L("private");
-    var $L159 = $L("protected");
-    var $L160 = $L("||>");
-    var $L161 = $L("|\u25B7");
-    var $L162 = $L("|>=");
-    var $L163 = $L("\u25B7=");
-    var $L164 = $L("|>");
-    var $L165 = $L("\u25B7");
-    var $L166 = $L("readonly");
-    var $L167 = $L("return");
-    var $L168 = $L("satisfies");
-    var $L169 = $L("'");
-    var $L170 = $L("static");
-    var $L171 = $L("${");
-    var $L172 = $L("switch");
-    var $L173 = $L("target");
-    var $L174 = $L("then");
-    var $L175 = $L("this");
-    var $L176 = $L("throw");
-    var $L177 = $L('"""');
-    var $L178 = $L("'''");
-    var $L179 = $L("///");
-    var $L180 = $L("```");
-    var $L181 = $L("try");
-    var $L182 = $L("typeof");
-    var $L183 = $L("unless");
-    var $L184 = $L("until");
-    var $L185 = $L("var");
-    var $L186 = $L("void");
-    var $L187 = $L("when");
-    var $L188 = $L("while");
-    var $L189 = $L("yield");
-    var $L190 = $L("/>");
-    var $L191 = $L("</");
-    var $L192 = $L("<>");
-    var $L193 = $L("</>");
-    var $L194 = $L("<!--");
-    var $L195 = $L("-->");
-    var $L196 = $L("type");
-    var $L197 = $L("enum");
-    var $L198 = $L("interface");
-    var $L199 = $L("global");
-    var $L200 = $L("module");
-    var $L201 = $L("namespace");
-    var $L202 = $L("asserts");
-    var $L203 = $L("keyof");
-    var $L204 = $L("infer");
-    var $L205 = $L("[]");
-    var $L206 = $L("civet");
+    var $L138 = $L("each");
+    var $L139 = $L("else");
+    var $L140 = $L("export");
+    var $L141 = $L("extends");
+    var $L142 = $L("finally");
+    var $L143 = $L("for");
+    var $L144 = $L("from");
+    var $L145 = $L("function");
+    var $L146 = $L("get");
+    var $L147 = $L("set");
+    var $L148 = $L("if");
+    var $L149 = $L("in");
+    var $L150 = $L("let");
+    var $L151 = $L("const");
+    var $L152 = $L("is");
+    var $L153 = $L("loop");
+    var $L154 = $L("new");
+    var $L155 = $L("not");
+    var $L156 = $L("<");
+    var $L157 = $L("operator");
+    var $L158 = $L("public");
+    var $L159 = $L("private");
+    var $L160 = $L("protected");
+    var $L161 = $L("||>");
+    var $L162 = $L("|\u25B7");
+    var $L163 = $L("|>=");
+    var $L164 = $L("\u25B7=");
+    var $L165 = $L("|>");
+    var $L166 = $L("\u25B7");
+    var $L167 = $L("readonly");
+    var $L168 = $L("return");
+    var $L169 = $L("satisfies");
+    var $L170 = $L("'");
+    var $L171 = $L("static");
+    var $L172 = $L("${");
+    var $L173 = $L("switch");
+    var $L174 = $L("target");
+    var $L175 = $L("then");
+    var $L176 = $L("this");
+    var $L177 = $L("throw");
+    var $L178 = $L('"""');
+    var $L179 = $L("'''");
+    var $L180 = $L("///");
+    var $L181 = $L("```");
+    var $L182 = $L("try");
+    var $L183 = $L("typeof");
+    var $L184 = $L("unless");
+    var $L185 = $L("until");
+    var $L186 = $L("var");
+    var $L187 = $L("void");
+    var $L188 = $L("when");
+    var $L189 = $L("while");
+    var $L190 = $L("yield");
+    var $L191 = $L("/>");
+    var $L192 = $L("</");
+    var $L193 = $L("<>");
+    var $L194 = $L("</>");
+    var $L195 = $L("<!--");
+    var $L196 = $L("-->");
+    var $L197 = $L("type");
+    var $L198 = $L("enum");
+    var $L199 = $L("interface");
+    var $L200 = $L("global");
+    var $L201 = $L("module");
+    var $L202 = $L("namespace");
+    var $L203 = $L("asserts");
+    var $L204 = $L("keyof");
+    var $L205 = $L("infer");
+    var $L206 = $L("[]");
+    var $L207 = $L("civet");
     var $R0 = $R(new RegExp("(as|of|satisfies|then|when|implements|xor|xnor)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
     var $R1 = $R(new RegExp("[0-9]", "suy"));
     var $R2 = $R(new RegExp("[)}]", "suy"));
@@ -3875,7 +3961,7 @@ ${input.slice(result.pos)}
     var $R7 = $R(new RegExp("<(?!\\p{ID_Start}|[_$])", "suy"));
     var $R8 = $R(new RegExp("!\\^\\^?", "suy"));
     var $R9 = $R(new RegExp("(?!\\+\\+|--)[!~+-](?!\\s|[!~+-]*[&.])", "suy"));
-    var $R10 = $R(new RegExp("(?=[\\s\\)])", "suy"));
+    var $R10 = $R(new RegExp("(?=[\\s\\),])", "suy"));
     var $R11 = $R(new RegExp('[^;"\\s]+', "suy"));
     var $R12 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
     var $R13 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
@@ -4500,7 +4586,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TrailingMemberExpressions$0 = $TS($S($Q(MemberExpressionRest), $Q($S($C(Samedent, IndentedFurther), $Y($S($E($EXPECT($L5, fail, 'TrailingMemberExpressions "?"')), $EXPECT($L6, fail, 'TrailingMemberExpressions "."'), $N($EXPECT($R1, fail, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
+    var TrailingMemberExpressions$0 = $TS($S($Q(MemberExpressionRest), $Q($S(IndentedAtLeast, $Y($S($E($EXPECT($L5, fail, 'TrailingMemberExpressions "?"')), $EXPECT($L6, fail, 'TrailingMemberExpressions "."'), $N($EXPECT($R1, fail, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
       return $1.concat($2);
     });
     function TrailingMemberExpressions(state) {
@@ -4551,7 +4637,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TrailingCallExpressions$0 = $P($S($C(Samedent, IndentedFurther), $Y($S($E($EXPECT($L5, fail, 'TrailingCallExpressions "?"')), $EXPECT($L6, fail, 'TrailingCallExpressions "."'), $N($R$0($EXPECT($R1, fail, "TrailingCallExpressions /[0-9]/"))))), $P(CallExpressionRest)));
+    var TrailingCallExpressions$0 = $P($S(IndentedAtLeast, $Y($S($E($EXPECT($L5, fail, 'TrailingCallExpressions "?"')), $EXPECT($L6, fail, 'TrailingCallExpressions "."'), $N($R$0($EXPECT($R1, fail, "TrailingCallExpressions /[0-9]/"))))), $P(CallExpressionRest)));
     function TrailingCallExpressions(state) {
       let eventData;
       if (state.events) {
@@ -4599,7 +4685,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CommaDelimiter$0 = $S($E($C(Samedent, IndentedFurther)), $Q(_), Comma);
+    var CommaDelimiter$0 = $S(NotDedented, Comma);
     function CommaDelimiter(state) {
       let eventData;
       if (state.events) {
@@ -5509,10 +5595,7 @@ ${input.slice(result.pos)}
       var head = $2;
       var body = $3;
       if (head.token === "&") {
-        const ref = {
-          type: "Ref",
-          base: "$"
-        };
+        const ref = makeRef("$");
         const arrowBody = {
           type: "PipelineExpression",
           children: [ws, ref, body]
@@ -7283,11 +7366,7 @@ ${input.slice(result.pos)}
     });
     var AtIdentifierRef$1 = $TV(IdentifierName, function($skip, $loc, $0, $1) {
       var id = $0;
-      return {
-        type: "Ref",
-        base: id.name,
-        id: id.name
-      };
+      return makeRef(id.name);
     });
     function AtIdentifierRef(state) {
       let eventData;
@@ -7909,11 +7988,7 @@ ${input.slice(result.pos)}
       }
     }
     var EmptyBindingPattern$0 = $TV($EXPECT($L0, fail, 'EmptyBindingPattern ""'), function($skip, $loc, $0, $1) {
-      const ref = {
-        type: "Ref",
-        base: "ref",
-        id: "ref"
-      };
+      const ref = makeRef();
       return {
         type: "EmptyBinding",
         children: [ref],
@@ -8071,11 +8146,7 @@ ${input.slice(result.pos)}
         return $skip;
       let body, ref;
       if (!rhs) {
-        body = ref = {
-          type: "Ref",
-          base: "$",
-          id: "$"
-        };
+        body = ref = makeRef("$");
       } else {
         let exp = rhs;
         while (!exp.ref && exp.expression) {
@@ -8255,11 +8326,7 @@ ${input.slice(result.pos)}
       var binopRHS = $3;
       if (!callExpRest && !binopRHS && !unaryPostfix)
         return $skip;
-      const ref = {
-        type: "Ref",
-        base: "$",
-        id: "$"
-      };
+      const ref = makeRef("$");
       let exp = {
         type: "AmpersandRef",
         children: [ref],
@@ -8755,7 +8822,7 @@ ${input.slice(result.pos)}
       var s = $3;
       var ws = $4;
       var c = $5;
-      if (!s.children.length)
+      if (!s.expressions.length)
         return $skip;
       return {
         type: "BlockStatement",
@@ -8830,16 +8897,16 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleLineStatements$0 = $TS($S($Q($S($S($E(_), $N(EOS)), Statement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), Statement, $E(SemicolonDelimiter)))), function($skip, $loc, $0, $1, $2) {
-      var stmts = $1;
-      var last = $2;
-      const children = [...stmts];
+    var SingleLineStatements$0 = $TS($S(ForbidNewlineBinaryOp, $Q($S($S($E(_), $N(EOS)), Statement, SemicolonDelimiter)), $E($S($S($E(_), $N(EOS)), Statement, $E(SemicolonDelimiter))), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var stmts = $2;
+      var last = $3;
+      const expressions = [...stmts];
       if (last)
-        children.push(last);
+        expressions.push(last);
       return {
         type: "BlockStatement",
-        expressions: children,
-        children,
+        expressions,
+        children: [expressions],
         bare: true
       };
     });
@@ -9295,9 +9362,7 @@ ${input.slice(result.pos)}
       } else {
         children = [open, content, ...ws, close];
       }
-      const names = children.flatMap((c) => {
-        return c.names || [];
-      });
+      const names = children.flatMap((c) => c?.names || []);
       return {
         type: "ArrayExpression",
         children,
@@ -9413,17 +9478,17 @@ ${input.slice(result.pos)}
       }
     }
     var ArrayLiteralContent$0 = RangeExpression;
-    var ArrayLiteralContent$1 = $S(NestedImplicitObjectLiteral, $Q($S(__, Comma, NestedImplicitObjectLiteral)));
-    var ArrayLiteralContent$2 = NestedElementList;
-    var ArrayLiteralContent$3 = $TS($S(ElementListWithIndentedApplicationForbidden, InsertComma, $E(NestedElementList)), function($skip, $loc, $0, $1, $2, $3) {
+    var ArrayLiteralContent$1 = $S(NestedElementList, $Y($S(__, CloseBracket)));
+    var ArrayLiteralContent$2 = $TS($S(ElementListWithIndentedApplicationForbidden, ArrayElementDelimiter, $E(NestedElementList), $Y($S(__, CloseBracket))), function($skip, $loc, $0, $1, $2, $3, $4) {
       var list = $1;
-      var comma = $2;
+      var delimiter = $2;
       var nested = $3;
-      if (nested) {
-        return [...list, comma, ...nested];
-      } else {
+      if (!nested)
         return list;
-      }
+      return [...list, delimiter, ...nested];
+    });
+    var ArrayLiteralContent$3 = $TV($Q($S(__, ElementListWithIndentedApplicationForbidden, ArrayElementDelimiter)), function($skip, $loc, $0, $1) {
+      return $1.flat();
     });
     function ArrayLiteralContent(state) {
       let eventData;
@@ -9571,9 +9636,9 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ElementList$0 = $TS($S(ArrayElementExpression, $Q(ElementListRest)), function($skip, $loc, $0, $1, $2) {
-      var first = $1;
-      var rest = $2;
+    var ElementList$0 = $TS($S($N(EOS), ArrayElementExpression, $Q(ElementListRest)), function($skip, $loc, $0, $1, $2, $3) {
+      var first = $2;
+      var rest = $3;
       if (rest.length) {
         return [{
           ...first,
@@ -9610,7 +9675,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ElementListRest$0 = $S($S(__, Comma), ArrayElementExpression);
+    var ElementListRest$0 = $S($S($E(_), Comma, $N(EOS)), ArrayElementExpression);
     function ElementListRest(state) {
       let eventData;
       if (state.events) {
@@ -9639,12 +9704,7 @@ ${input.slice(result.pos)}
       var ws = $2;
       var dots = $3;
       if (!exp) {
-        exp = {
-          type: "Ref",
-          base: "ref",
-          id: "ref",
-          names: []
-        };
+        exp = { ...makeRef(), names: [] };
       }
       return {
         type: "SpreadElement",
@@ -9725,26 +9785,16 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BracedObjectLiteral$0 = $TS($S(OpenBrace, AllowAll, $E($S($E(BracedObjectLiteralContent), __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var BracedObjectLiteral$0 = $TS($S(OpenBrace, AllowAll, $E($S(BracedObjectLiteralContent, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
       if (!$3)
         return $skip;
       const [properties, ...close] = $3;
-      if (properties) {
-        const children = [open, ...properties, close];
-        return {
-          type: "ObjectExpression",
-          children,
-          names: children.flatMap((c) => {
-            return c.names || [];
-          }),
-          properties
-        };
-      }
       return {
         type: "ObjectExpression",
-        children: [open, close],
-        names: []
+        children: [open, properties, close],
+        names: properties.flatMap((c) => c.names || []),
+        properties
       };
     });
     function BracedObjectLiteral(state) {
@@ -9769,8 +9819,33 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BracedObjectLiteralContent$0 = NestedPropertyDefinitions;
-    var BracedObjectLiteralContent$1 = PropertyDefinitionList;
+    var BracedObjectLiteralContent$0 = $TS($S($Q($S(PropertyDefinition, ObjectPropertyDelimiter)), $E(NestedPropertyDefinitions)), function($skip, $loc, $0, $1, $2) {
+      var line = $1;
+      var nested = $2;
+      line = line.flatMap(([prop, delim]) => {
+        prop = Array.isArray(prop) ? prop : [prop];
+        let last = prop[prop.length - 1];
+        last = {
+          ...last,
+          delim,
+          children: [...last.children, delim]
+        };
+        return [...prop.slice(0, prop.length - 1), last];
+      });
+      return line.concat(nested || []);
+    });
+    var BracedObjectLiteralContent$1 = $TV($P($S(__, PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
+      return $0.flatMap(([ws, prop, delim]) => {
+        prop = Array.isArray(prop) ? prop : [prop];
+        let last = prop[prop.length - 1];
+        last = {
+          ...last,
+          delim,
+          children: [ws, ...last.children.slice(1), delim]
+        };
+        return [...prop.slice(0, prop.length - 1), last];
+      });
+    });
     function BracedObjectLiteralContent(state) {
       let eventData;
       if (state.events) {
@@ -9794,9 +9869,11 @@ ${input.slice(result.pos)}
       }
     }
     var NestedImplicitObjectLiteral$0 = $TS($S(InsertOpenBrace, NestedImplicitPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var properties = $2;
       return {
         type: "ObjectExpression",
-        children: [$1, ...$2, $3, $4, $5]
+        properties,
+        children: $0
       };
     });
     function NestedImplicitObjectLiteral(state) {
@@ -9849,7 +9926,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, ImplicitNamedProperty, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
+    var NestedImplicitPropertyDefinition$0 = $TS($S(Nested, NamedProperty, ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var prop = $2;
       var delimiter = $3;
@@ -9952,7 +10029,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, $Q($S(ImplicitInlineObjectPropertyDelimiter, ImplicitNamedProperty)), $E($S($E(_), Comma, $Y(Dedented))), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, $Q($S(ImplicitInlineObjectPropertyDelimiter, NamedProperty)), $E($S($E(_), Comma, $Y(Dedented))), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var open = $1;
       var first = $2;
       var rest = $3;
@@ -9986,7 +10063,7 @@ ${input.slice(result.pos)}
       }
     }
     var ImplicitInlineObjectPropertyDelimiter$0 = $S($E(_), Comma, $C(NotDedented, $E(_)));
-    var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S(Samedent, ImplicitNamedProperty)), InsertComma, $C(Samedent, $E(_))), function(value) {
+    var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S(Nested, NamedProperty)), InsertComma, $C(Nested, $E(_))), function(value) {
       return [value[1], value[2]];
     });
     function ImplicitInlineObjectPropertyDelimiter(state) {
@@ -10038,41 +10115,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PropertyDefinitionList$0 = $TV($P($S(PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
-      return $0.flatMap(([prop, delim]) => {
-        prop = Array.isArray(prop) ? prop : [prop];
-        let last = prop[prop.length - 1];
-        last = {
-          ...last,
-          delim,
-          children: [...last.children, delim]
-        };
-        return [...prop.slice(0, prop.length - 1), last];
-      });
-    });
-    function PropertyDefinitionList(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("PropertyDefinitionList", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("PropertyDefinitionList", state, PropertyDefinitionList$0(state));
-        if (state.events)
-          state.events.exit?.("PropertyDefinitionList", state, result, eventData);
-        return result;
-      } else {
-        const result = PropertyDefinitionList$0(state);
-        if (state.events)
-          state.events.exit?.("PropertyDefinitionList", state, result, eventData);
-        return result;
-      }
-    }
-    var PropertyDefinition$0 = $TS($S(__, AtThis, IdentifierReference), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$0 = $TS($S($E(_), AtThis, IdentifierReference), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var at = $2;
       var id = $3;
@@ -10085,7 +10128,7 @@ ${input.slice(result.pos)}
         value
       };
     });
-    var PropertyDefinition$1 = $TS($S(__, NamedProperty), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$1 = $TS($S($E(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var prop = $2;
       return {
@@ -10093,7 +10136,7 @@ ${input.slice(result.pos)}
         children: [ws, ...prop.children]
       };
     });
-    var PropertyDefinition$2 = $TS($S(__, $TEXT($EXPECT($R6, fail, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$2 = $TS($S($E(_), $TEXT($EXPECT($R6, fail, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var toggle = $2;
       var id = $3;
@@ -10106,7 +10149,7 @@ ${input.slice(result.pos)}
         value
       };
     });
-    var PropertyDefinition$3 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$3 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
       if (!def.block || def.block.empty)
@@ -10116,7 +10159,7 @@ ${input.slice(result.pos)}
         children: [ws, ...def.children]
       };
     });
-    var PropertyDefinition$4 = $TS($S(__, DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$4 = $TS($S($E(_), DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
       var exp = $3;
@@ -10128,9 +10171,9 @@ ${input.slice(result.pos)}
         value: exp
       };
     });
-    var PropertyDefinition$5 = $TS($S(__, CallExpression), function($skip, $loc, $0, $1, $2) {
+    var PropertyDefinition$5 = $TS($S($E(_), $N(EOS), CallExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
-      var value = $2;
+      var value = $3;
       switch (value.type) {
         case "Identifier":
           return { ...value, children: [ws, ...value.children] };
@@ -10251,41 +10294,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImplicitNamedProperty$0 = $TS($S(PropertyName, $E(_), Colon, $C(MultiLineImplicitObjectLiteralAllowed, $N(EOS)), ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var name = $1;
-      var exp = $5;
-      return {
-        type: "Property",
-        children: $0,
-        name,
-        names: exp.names || [],
-        value: exp
-      };
-    });
-    function ImplicitNamedProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ImplicitNamedProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ImplicitNamedProperty", state, ImplicitNamedProperty$0(state));
-        if (state.events)
-          state.events.exit?.("ImplicitNamedProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = ImplicitNamedProperty$0(state);
-        if (state.events)
-          state.events.exit?.("ImplicitNamedProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var SnugNamedProperty$0 = $TS($S(PropertyName, Colon, $C(MultiLineImplicitObjectLiteralAllowed, $N(EOS)), ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var exp = $4;
+    var SnugNamedProperty$0 = $TS($S(PropertyName, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
+      var exp = $3;
       return {
         type: "Property",
         children: $0,
@@ -10861,7 +10871,7 @@ ${input.slice(result.pos)}
         ws.push(...$2);
       return [ws, $3];
     });
-    var NotDedentedBinaryOp$1 = $TS($S(Samedent, $E(_), $N(Identifier), BinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var NotDedentedBinaryOp$1 = $TS($S(Nested, $E(_), $N(Identifier), BinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
       const ws = [...$1];
       if ($2)
         ws.push(...$2);
@@ -11649,7 +11659,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ElseClause$0 = $S(Samedent, Else, Block);
+    var ElseClause$0 = $S(Nested, Else, Block);
     var ElseClause$1 = $S($E(_), Else, Block);
     function ElseClause(state) {
       let eventData;
@@ -11793,7 +11803,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ElseExpressionClause$0 = $TS($S($C($S(Samedent, Else), $S($E(_), Else)), ElseExpressionBlock), function($skip, $loc, $0, $1, $2) {
+    var ElseExpressionClause$0 = $TS($S($C($S(Nested, Else), $S($E(_), Else)), ElseExpressionBlock), function($skip, $loc, $0, $1, $2) {
       return [...$1, $2];
     });
     function ElseExpressionClause(state) {
@@ -12290,7 +12300,8 @@ ${input.slice(result.pos)}
         children: [$1, ...$2, ...children],
         declaration,
         block: null,
-        blockPrefix: c.blockPrefix
+        blockPrefix: c.blockPrefix,
+        hoistDec: c.hoistDec
       };
     });
     function ForClause(state) {
@@ -12398,7 +12409,7 @@ ${input.slice(result.pos)}
         if (step) {
           throw new Error("Can't use 'by' with 'from' in CoffeeScript for loops");
         }
-        kind.token = "of";
+        kind = { ...kind, token: "of" };
       } else if (kind.token === "of") {
         if (step) {
           throw new Error("Can't use 'by' with 'of' in CoffeeScript for loops");
@@ -12416,30 +12427,12 @@ ${input.slice(result.pos)}
         }
         kind.token = "in";
       } else if (kind.token === "in") {
-        const counterRef = {
-          type: "Ref",
-          base: "i",
-          id: "i"
-        };
-        const lenRef = {
-          type: "Ref",
-          base: "len",
-          id: "len"
-        };
-        let expRef;
-        switch (exp.type) {
-          case "Identifier":
-            expRef = exp;
-            break;
-          case "RangeExpression":
-            return forRange(open, declaration, exp, step?.[2], close);
-          default:
-            expRef = {
-              type: "Ref",
-              base: "ref",
-              id: "ref"
-            };
+        const counterRef = makeRef("i");
+        const lenRef = makeRef("len");
+        if (exp.type === "RangeExpression") {
+          return forRange(open, declaration, exp, step?.[2], close);
         }
+        const expRef = maybeRef(exp);
         const varRef = declaration;
         let increment = "++", indexAssignment, assignmentNames = [...varRef.names];
         if (index) {
@@ -12594,39 +12587,11 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var ForStatementParameters$2 = $TS($S($E($S(Await, __)), OpenParen, __, ForInOfDeclaration, __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
-      var open = $2;
-      var declaration = $4;
-      var op = $6;
-      var exp = $7;
-      var step = $8;
-      var close = $10;
-      if (exp.type === "RangeExpression" && op.token === "of") {
-        return forRange(open, declaration, exp, step, close);
-      } else if (step) {
-        throw new Error("for..of/in cannot use 'by' except with range literals");
-      }
-      return {
-        declaration,
-        children: $0
-      };
+    var ForStatementParameters$2 = $TS($S($E($S(Await, __)), $E($S(Each, __)), $S(OpenParen, __), ForInOfDeclaration, $E($S(__, Comma, __, ForInOfDeclaration)), __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), $S(__, CloseParen)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
+      return processForInOf($0);
     });
-    var ForStatementParameters$3 = $TS($S($E($S(Await, __)), InsertOpenParen, ForInOfDeclaration, __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
-      var open = $2;
-      var declaration = $3;
-      var op = $5;
-      var exp = $6;
-      var step = $7;
-      var close = $8;
-      if (exp.type === "RangeExpression" && op.token === "of") {
-        return forRange(open, declaration, exp, step, close);
-      } else if (step) {
-        throw new Error("for..of/in cannot use 'by' except with range literals");
-      }
-      return {
-        declaration,
-        children: $0
-      };
+    var ForStatementParameters$3 = $TS($S($E($S(Await, __)), $E($S(Each, __)), InsertOpenParen, ForInOfDeclaration, $E($S(__, Comma, __, ForInOfDeclaration)), __, $C(In, Of), ExpressionWithObjectApplicationForbidden, $E($S(__, By, ExpressionWithObjectApplicationForbidden)), InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) {
+      return processForInOf($0);
     });
     var ForStatementParameters$4 = ForRangeParameters;
     function ForStatementParameters(state) {
@@ -12693,6 +12658,7 @@ ${input.slice(result.pos)}
         type: "ForDeclaration",
         children: $0,
         declare: $1,
+        binding,
         names: binding.names
       };
     });
@@ -12727,16 +12693,18 @@ ${input.slice(result.pos)}
         type: "ForDeclaration",
         children: [c, binding],
         declare: c,
+        binding,
         names: binding.names
       };
     });
-    var ForDeclaration$1 = $TS($S(InsertConst, ForBinding, $EXPECT($R10, fail, "ForDeclaration /(?=[\\s\\)])/")), function($skip, $loc, $0, $1, $2, $3) {
+    var ForDeclaration$1 = $TS($S(InsertConst, ForBinding, $EXPECT($R10, fail, "ForDeclaration /(?=[\\s\\),])/")), function($skip, $loc, $0, $1, $2, $3) {
       var c = $1;
       var binding = $2;
       return {
         type: "ForDeclaration",
         children: [c, binding],
         declare: c,
+        binding,
         names: binding.names
       };
     });
@@ -12897,7 +12865,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CaseBlock$0 = $TS($S($E($C(Samedent, _)), OpenBrace, NestedCaseClauses, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var CaseBlock$0 = $TS($S($E($C(Nested, _)), OpenBrace, NestedCaseClauses, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var clauses = $3;
       return {
         type: "CaseBlock",
@@ -13114,11 +13082,9 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CaseExpressionList$0 = $TS($S(ForbidMultiLineImplicitObjectLiteral, $E($S($E(_), CaseExpression, InsertColon)), $Q($S(__, Comma, CaseExpression, InsertColon)), RestoreMultiLineImplicitObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var first = $2;
-      var rest = $3;
-      if (!first)
-        return $skip;
+    var CaseExpressionList$0 = $TS($S($S($E(_), CaseExpression, InsertColon), $Q($S(__, Comma, CaseExpression, InsertColon))), function($skip, $loc, $0, $1, $2) {
+      var first = $1;
+      var rest = $2;
       const result = rest.map(([ws, _comma, exp, col]) => {
         exp = insertTrimmingSpace(exp, "");
         if (ws.length)
@@ -13311,7 +13277,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CatchClause$0 = $TS($S($C(Samedent, _), Catch, $E(CatchBind), $C(ThenClause, BracedOrEmptyBlock)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CatchClause$0 = $TS($S($C(Nested, _), Catch, $E(CatchBind), $C(ThenClause, BracedOrEmptyBlock)), function($skip, $loc, $0, $1, $2, $3, $4) {
       var block = $4;
       return {
         type: "CatchClause",
@@ -13365,7 +13331,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FinallyClause$0 = $S($C(Samedent, _), Finally, $C(ThenClause, BracedOrEmptyBlock));
+    var FinallyClause$0 = $S($C(Nested, _), Finally, $C(ThenClause, BracedOrEmptyBlock));
     function FinallyClause(state) {
       let eventData;
       if (state.events) {
@@ -13473,10 +13439,7 @@ ${input.slice(result.pos)}
     }
     var DeclarationCondition$0 = $TV(LexicalDeclaration, function($skip, $loc, $0, $1) {
       var dec = $0;
-      const ref = {
-        type: "Ref",
-        base: "ref"
-      };
+      const ref = makeRef();
       const { decl, bindings } = dec;
       const binding = bindings[0];
       const { pattern, suffix, initializer, splices, thisAssignments } = binding;
@@ -13989,110 +13952,6 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ForbidMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L0, fail, 'ForbidMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
-      module.forbidMultiLineImplicitObjectLiteral.push(true);
-    });
-    function ForbidMultiLineImplicitObjectLiteral(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ForbidMultiLineImplicitObjectLiteral", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ForbidMultiLineImplicitObjectLiteral", state, ForbidMultiLineImplicitObjectLiteral$0(state));
-        if (state.events)
-          state.events.exit?.("ForbidMultiLineImplicitObjectLiteral", state, result, eventData);
-        return result;
-      } else {
-        const result = ForbidMultiLineImplicitObjectLiteral$0(state);
-        if (state.events)
-          state.events.exit?.("ForbidMultiLineImplicitObjectLiteral", state, result, eventData);
-        return result;
-      }
-    }
-    var AllowMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L0, fail, 'AllowMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
-      module.forbidMultiLineImplicitObjectLiteral.push(false);
-    });
-    function AllowMultiLineImplicitObjectLiteral(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("AllowMultiLineImplicitObjectLiteral", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("AllowMultiLineImplicitObjectLiteral", state, AllowMultiLineImplicitObjectLiteral$0(state));
-        if (state.events)
-          state.events.exit?.("AllowMultiLineImplicitObjectLiteral", state, result, eventData);
-        return result;
-      } else {
-        const result = AllowMultiLineImplicitObjectLiteral$0(state);
-        if (state.events)
-          state.events.exit?.("AllowMultiLineImplicitObjectLiteral", state, result, eventData);
-        return result;
-      }
-    }
-    var RestoreMultiLineImplicitObjectLiteral$0 = $TV($EXPECT($L0, fail, 'RestoreMultiLineImplicitObjectLiteral ""'), function($skip, $loc, $0, $1) {
-      module.forbidMultiLineImplicitObjectLiteral.pop();
-    });
-    function RestoreMultiLineImplicitObjectLiteral(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("RestoreMultiLineImplicitObjectLiteral", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("RestoreMultiLineImplicitObjectLiteral", state, RestoreMultiLineImplicitObjectLiteral$0(state));
-        if (state.events)
-          state.events.exit?.("RestoreMultiLineImplicitObjectLiteral", state, result, eventData);
-        return result;
-      } else {
-        const result = RestoreMultiLineImplicitObjectLiteral$0(state);
-        if (state.events)
-          state.events.exit?.("RestoreMultiLineImplicitObjectLiteral", state, result, eventData);
-        return result;
-      }
-    }
-    var MultiLineImplicitObjectLiteralAllowed$0 = $TV($EXPECT($L0, fail, 'MultiLineImplicitObjectLiteralAllowed ""'), function($skip, $loc, $0, $1) {
-      if (module.config.verbose) {
-        console.log("forbidMultiLineImplicitObjectLiteral:", module.forbidMultiLineImplicitObjectLiteral);
-      }
-      if (module.multiLineImplicitObjectLiteralForbidden)
-        return $skip;
-    });
-    function MultiLineImplicitObjectLiteralAllowed(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MultiLineImplicitObjectLiteralAllowed", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MultiLineImplicitObjectLiteralAllowed", state, MultiLineImplicitObjectLiteralAllowed$0(state));
-        if (state.events)
-          state.events.exit?.("MultiLineImplicitObjectLiteralAllowed", state, result, eventData);
-        return result;
-      } else {
-        const result = MultiLineImplicitObjectLiteralAllowed$0(state);
-        if (state.events)
-          state.events.exit?.("MultiLineImplicitObjectLiteralAllowed", state, result, eventData);
-        return result;
-      }
-    }
     var AllowNewlineBinaryOp$0 = $TV($EXPECT($L0, fail, 'AllowNewlineBinaryOp ""'), function($skip, $loc, $0, $1) {
       module.forbidNewlineBinaryOp.push(false);
     });
@@ -14197,7 +14056,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AllowAll$0 = $S(AllowTrailingMemberProperty, AllowBracedApplication, AllowIndentedApplication, AllowMultiLineImplicitObjectLiteral, AllowClassImplicitCall, AllowNewlineBinaryOp);
+    var AllowAll$0 = $S(AllowTrailingMemberProperty, AllowBracedApplication, AllowIndentedApplication, AllowClassImplicitCall, AllowNewlineBinaryOp);
     function AllowAll(state) {
       let eventData;
       if (state.events) {
@@ -14220,7 +14079,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var RestoreAll$0 = $S(RestoreTrailingMemberProperty, RestoreBracedApplication, RestoreIndentedApplication, RestoreMultiLineImplicitObjectLiteral, RestoreClassImplicitCall, RestoreNewlineBinaryOp);
+    var RestoreAll$0 = $S(RestoreTrailingMemberProperty, RestoreBracedApplication, RestoreIndentedApplication, RestoreClassImplicitCall, RestoreNewlineBinaryOp);
     function RestoreAll(state) {
       let eventData;
       if (state.events) {
@@ -16823,7 +16682,7 @@ ${input.slice(result.pos)}
       }
     }
     var StatementDelimiter$0 = SemicolonDelimiter;
-    var StatementDelimiter$1 = $S($Y($S(Samedent, $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($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$2 = $Y(EOS);
     function StatementDelimiter(state) {
       let eventData;
@@ -17636,7 +17495,32 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Else$0 = $TS($S($EXPECT($L138, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Each$0 = $TS($S($EXPECT($L138, fail, 'Each "each"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      return { $loc, token: $1 };
+    });
+    function Each(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("Each", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("Each", state, Each$0(state));
+        if (state.events)
+          state.events.exit?.("Each", state, result, eventData);
+        return result;
+      } else {
+        const result = Each$0(state);
+        if (state.events)
+          state.events.exit?.("Each", state, result, eventData);
+        return result;
+      }
+    }
+    var Else$0 = $TS($S($EXPECT($L139, fail, 'Else "else"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Else(state) {
@@ -17686,7 +17570,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Export$0 = $TS($S($EXPECT($L139, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Export$0 = $TS($S($EXPECT($L140, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Export(state) {
@@ -17711,7 +17595,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Extends$0 = $TS($S($EXPECT($L140, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Extends$0 = $TS($S($EXPECT($L141, fail, 'Extends "extends"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Extends(state) {
@@ -17736,7 +17620,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Finally$0 = $TS($S($EXPECT($L141, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Finally$0 = $TS($S($EXPECT($L142, fail, 'Finally "finally"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Finally(state) {
@@ -17761,7 +17645,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var For$0 = $TS($S($EXPECT($L142, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var For$0 = $TS($S($EXPECT($L143, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function For(state) {
@@ -17786,7 +17670,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var From$0 = $TS($S($EXPECT($L143, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var From$0 = $TS($S($EXPECT($L144, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function From(state) {
@@ -17811,7 +17695,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Function$0 = $TS($S($EXPECT($L144, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Function$0 = $TS($S($EXPECT($L145, fail, 'Function "function"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Function(state) {
@@ -17836,7 +17720,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var GetOrSet$0 = $TS($S($C($EXPECT($L145, fail, 'GetOrSet "get"'), $EXPECT($L146, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var GetOrSet$0 = $TS($S($C($EXPECT($L146, fail, 'GetOrSet "get"'), $EXPECT($L147, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "GetOrSet" };
     });
     function GetOrSet(state) {
@@ -17861,7 +17745,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var If$0 = $TV($TEXT($S($EXPECT($L147, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L11, fail, 'If " "')))), function($skip, $loc, $0, $1) {
+    var If$0 = $TV($TEXT($S($EXPECT($L148, fail, 'If "if"'), NonIdContinue, $E($EXPECT($L11, fail, 'If " "')))), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function If(state) {
@@ -17911,7 +17795,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var In$0 = $TS($S($EXPECT($L148, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var In$0 = $TS($S($EXPECT($L149, fail, 'In "in"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function In(state) {
@@ -17936,7 +17820,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LetOrConst$0 = $TS($S($C($EXPECT($L149, fail, 'LetOrConst "let"'), $EXPECT($L150, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var LetOrConst$0 = $TS($S($C($EXPECT($L150, fail, 'LetOrConst "let"'), $EXPECT($L151, fail, 'LetOrConst "const"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function LetOrConst(state) {
@@ -17961,7 +17845,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Const$0 = $TS($S($EXPECT($L150, fail, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Const$0 = $TS($S($EXPECT($L151, fail, 'Const "const"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Const(state) {
@@ -17986,7 +17870,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Is$0 = $TS($S($EXPECT($L151, fail, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Is$0 = $TS($S($EXPECT($L152, fail, 'Is "is"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Is(state) {
@@ -18035,7 +17919,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Loop$0 = $TS($S($EXPECT($L152, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Loop$0 = $TS($S($EXPECT($L153, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "while(true)" };
     });
     function Loop(state) {
@@ -18060,7 +17944,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var New$0 = $TS($S($EXPECT($L153, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var New$0 = $TS($S($EXPECT($L154, fail, 'New "new"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function New(state) {
@@ -18085,7 +17969,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Not$0 = $TS($S($EXPECT($L154, fail, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L12, fail, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
+    var Not$0 = $TS($S($EXPECT($L155, fail, 'Not "not"'), NonIdContinue, $N($S($E(_), $EXPECT($L12, fail, 'Not ":"')))), function($skip, $loc, $0, $1, $2, $3) {
       return { $loc, token: "!" };
     });
     function Not(state) {
@@ -18135,7 +18019,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OpenAngleBracket$0 = $TV($EXPECT($L155, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
+    var OpenAngleBracket$0 = $TV($EXPECT($L156, fail, 'OpenAngleBracket "<"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function OpenAngleBracket(state) {
@@ -18235,7 +18119,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Operator$0 = $TS($S($EXPECT($L156, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Operator$0 = $TS($S($EXPECT($L157, fail, 'Operator "operator"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Operator(state) {
@@ -18260,7 +18144,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Public$0 = $TS($S($EXPECT($L157, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Public$0 = $TS($S($EXPECT($L158, fail, 'Public "public"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Public(state) {
@@ -18285,7 +18169,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Private$0 = $TS($S($EXPECT($L158, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Private$0 = $TS($S($EXPECT($L159, fail, 'Private "private"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Private(state) {
@@ -18310,7 +18194,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Protected$0 = $TS($S($EXPECT($L159, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Protected$0 = $TS($S($EXPECT($L160, fail, 'Protected "protected"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Protected(state) {
@@ -18335,13 +18219,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Pipe$0 = $TV($C($EXPECT($L160, fail, 'Pipe "||>"'), $EXPECT($L161, fail, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
+    var Pipe$0 = $TV($C($EXPECT($L161, fail, 'Pipe "||>"'), $EXPECT($L162, fail, 'Pipe "|\u25B7"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "||>" };
     });
-    var Pipe$1 = $TV($C($EXPECT($L162, fail, 'Pipe "|>="'), $EXPECT($L163, fail, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
+    var Pipe$1 = $TV($C($EXPECT($L163, fail, 'Pipe "|>="'), $EXPECT($L164, fail, 'Pipe "\u25B7="')), function($skip, $loc, $0, $1) {
       return { $loc, token: "|>=" };
     });
-    var Pipe$2 = $TV($C($EXPECT($L164, fail, 'Pipe "|>"'), $EXPECT($L165, fail, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
+    var Pipe$2 = $TV($C($EXPECT($L165, fail, 'Pipe "|>"'), $EXPECT($L166, fail, 'Pipe "\u25B7"')), function($skip, $loc, $0, $1) {
       return { $loc, token: "|>" };
     });
     function Pipe(state) {
@@ -18391,7 +18275,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Readonly$0 = $TS($S($EXPECT($L166, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Readonly$0 = $TS($S($EXPECT($L167, fail, 'Readonly "readonly"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, ts: true };
     });
     function Readonly(state) {
@@ -18416,7 +18300,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Return$0 = $TS($S($EXPECT($L167, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Return$0 = $TS($S($EXPECT($L168, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Return(state) {
@@ -18441,7 +18325,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Satisfies$0 = $TS($S($EXPECT($L168, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Satisfies$0 = $TS($S($EXPECT($L169, fail, 'Satisfies "satisfies"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Satisfies(state) {
@@ -18491,7 +18375,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SingleQuote$0 = $TV($EXPECT($L169, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+    var SingleQuote$0 = $TV($EXPECT($L170, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SingleQuote(state) {
@@ -18541,7 +18425,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Static$0 = $TS($S($EXPECT($L170, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Static$0 = $TS($S($EXPECT($L171, fail, 'Static "static"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     var Static$1 = $TS($S($EXPECT($L118, fail, 'Static "@"'), $N($C($EXPECT($L4, fail, 'Static "("'), $EXPECT($L118, fail, 'Static "@"')))), function($skip, $loc, $0, $1, $2) {
@@ -18569,7 +18453,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var SubstitutionStart$0 = $TV($EXPECT($L171, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+    var SubstitutionStart$0 = $TV($EXPECT($L172, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function SubstitutionStart(state) {
@@ -18594,7 +18478,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Switch$0 = $TS($S($EXPECT($L172, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Switch$0 = $TS($S($EXPECT($L173, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Switch(state) {
@@ -18619,7 +18503,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Target$0 = $TS($S($EXPECT($L173, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Target$0 = $TS($S($EXPECT($L174, fail, 'Target "target"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Target(state) {
@@ -18644,7 +18528,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Then$0 = $TS($S(__, $EXPECT($L174, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
+    var Then$0 = $TS($S(__, $EXPECT($L175, fail, 'Then "then"'), NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
       return { $loc, token: "" };
     });
     function Then(state) {
@@ -18669,7 +18553,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var This$0 = $TS($S($EXPECT($L175, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var This$0 = $TS($S($EXPECT($L176, fail, 'This "this"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function This(state) {
@@ -18694,7 +18578,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Throw$0 = $TS($S($EXPECT($L176, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Throw$0 = $TS($S($EXPECT($L177, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Throw(state) {
@@ -18719,7 +18603,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleDoubleQuote$0 = $TV($EXPECT($L177, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+    var TripleDoubleQuote$0 = $TV($EXPECT($L178, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleDoubleQuote(state) {
@@ -18744,7 +18628,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleSingleQuote$0 = $TV($EXPECT($L178, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+    var TripleSingleQuote$0 = $TV($EXPECT($L179, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleSingleQuote(state) {
@@ -18769,7 +18653,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleSlash$0 = $TV($EXPECT($L179, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
+    var TripleSlash$0 = $TV($EXPECT($L180, fail, 'TripleSlash "///"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "/" };
     });
     function TripleSlash(state) {
@@ -18794,7 +18678,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TripleTick$0 = $TV($EXPECT($L180, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+    var TripleTick$0 = $TV($EXPECT($L181, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "`" };
     });
     function TripleTick(state) {
@@ -18819,7 +18703,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Try$0 = $TS($S($EXPECT($L181, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Try$0 = $TS($S($EXPECT($L182, fail, 'Try "try"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Try(state) {
@@ -18844,7 +18728,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Typeof$0 = $TS($S($EXPECT($L182, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Typeof$0 = $TS($S($EXPECT($L183, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Typeof(state) {
@@ -18869,7 +18753,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Unless$0 = $TS($S($EXPECT($L183, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Unless$0 = $TS($S($EXPECT($L184, fail, 'Unless "unless"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Unless(state) {
@@ -18894,7 +18778,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Until$0 = $TS($S($EXPECT($L184, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Until$0 = $TS($S($EXPECT($L185, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Until(state) {
@@ -18919,7 +18803,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Var$0 = $TS($S($EXPECT($L185, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Var$0 = $TS($S($EXPECT($L186, fail, 'Var "var"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Var(state) {
@@ -18944,7 +18828,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Void$0 = $TS($S($EXPECT($L186, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Void$0 = $TS($S($EXPECT($L187, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Void(state) {
@@ -18969,7 +18853,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var When$0 = $TS($S($EXPECT($L187, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var When$0 = $TS($S($EXPECT($L188, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "case" };
     });
     function When(state) {
@@ -18994,7 +18878,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var While$0 = $TS($S($EXPECT($L188, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var While$0 = $TS($S($EXPECT($L189, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function While(state) {
@@ -19019,7 +18903,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Yield$0 = $TS($S($EXPECT($L189, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Yield$0 = $TS($S($EXPECT($L190, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1, type: "Yield" };
     });
     function Yield(state) {
@@ -19044,7 +18928,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXImplicitFragment$0 = $TS($S(JSXTag, $Q($S(Samedent, JSXTag))), function($skip, $loc, $0, $1, $2) {
+    var JSXImplicitFragment$0 = $TS($S(JSXTag, $Q($S(Nested, JSXTag))), function($skip, $loc, $0, $1, $2) {
       const jsx = $2.length === 0 ? $1 : {
         type: "JSXFragment",
         children: [
@@ -19164,7 +19048,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L155, fail, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L190, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L156, fail, 'JSXSelfClosingElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L191, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return { type: "JSXElement", children: $0, tag: $2 };
     });
     function JSXSelfClosingElement(state) {
@@ -19240,7 +19124,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L155, fail, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L34, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L156, fail, 'JSXOpeningElement "<"'), JSXElementName, $E(TypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L34, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       let eventData;
       if (state.events) {
@@ -19292,7 +19176,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingElement$0 = $S($EXPECT($L191, fail, 'JSXClosingElement "</"'), $E(Whitespace), JSXElementName, $E(Whitespace), $EXPECT($L34, fail, 'JSXClosingElement ">"'));
+    var JSXClosingElement$0 = $S($EXPECT($L192, fail, 'JSXClosingElement "</"'), $E(Whitespace), JSXElementName, $E(Whitespace), $EXPECT($L34, fail, 'JSXClosingElement ">"'));
     function JSXClosingElement(state) {
       let eventData;
       if (state.events) {
@@ -19330,7 +19214,7 @@ ${input.slice(result.pos)}
       ];
       return { type: "JSXFragment", children: parts, jsxChildren: children.jsxChildren };
     });
-    var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L192, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var JSXFragment$1 = $TS($S(CoffeeJSXEnabled, $EXPECT($L193, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), JSXClosingFragment), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var children = $3;
       $0 = $0.slice(1);
       return {
@@ -19361,7 +19245,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PushJSXOpeningFragment$0 = $TV($EXPECT($L192, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
+    var PushJSXOpeningFragment$0 = $TV($EXPECT($L193, fail, 'PushJSXOpeningFragment "<>"'), function($skip, $loc, $0, $1) {
       module.JSXTagStack.push("");
       return $1;
     });
@@ -19415,7 +19299,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingFragment$0 = $EXPECT($L193, fail, 'JSXClosingFragment "</>"');
+    var JSXClosingFragment$0 = $EXPECT($L194, fail, 'JSXClosingFragment "</>"');
     function JSXClosingFragment(state) {
       let eventData;
       if (state.events) {
@@ -20384,7 +20268,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXComment$0 = $TS($S($EXPECT($L194, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L195, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
+    var JSXComment$0 = $TS($S($EXPECT($L195, fail, 'JSXComment "<!--"'), JSXCommentContent, $EXPECT($L196, fail, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
       return ["{/*", $2, "*/}"];
     });
     function JSXComment(state) {
@@ -20564,7 +20448,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeDeclarationRest$0 = $S(TypeKeyword, $E(_), IdentifierName, $E(TypeParameters), __, Equals, $C($S($E(_), Type), $S(__, Type)));
+    var TypeDeclarationRest$0 = $S(TypeKeyword, $E(_), IdentifierName, $E(TypeParameters), OptionalEquals, $C($S($E(_), Type), $S(__, Type)));
     var TypeDeclarationRest$1 = $S(Interface, $E(_), IdentifierName, $E(TypeParameters), $E(InterfaceExtendsClause), InterfaceBlock);
     var TypeDeclarationRest$2 = $S(Namespace, $E(_), IdentifierName, ModuleBlock);
     var TypeDeclarationRest$3 = FunctionSignature;
@@ -20590,6 +20474,32 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var OptionalEquals$0 = $S(__, Equals);
+    var OptionalEquals$1 = $T($S($Y(IndentedFurther), InsertSpaceEquals), function(value) {
+      return value[1];
+    });
+    function OptionalEquals(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("OptionalEquals", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("OptionalEquals", state, OptionalEquals$0(state) || OptionalEquals$1(state));
+        if (state.events)
+          state.events.exit?.("OptionalEquals", state, result, eventData);
+        return result;
+      } else {
+        const result = OptionalEquals$0(state) || OptionalEquals$1(state);
+        if (state.events)
+          state.events.exit?.("OptionalEquals", state, result, eventData);
+        return result;
+      }
+    }
     var TypeLexicalDeclaration$0 = $S(__, LetOrConstOrVar, TypeDeclarationBinding, $Q($S(CommaDelimiter, __, TypeDeclarationBinding)));
     var TypeLexicalDeclaration$1 = $S(__, EnumDeclaration);
     var TypeLexicalDeclaration$2 = ClassSignature;
@@ -20687,7 +20597,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeKeyword$0 = $TS($S($EXPECT($L196, fail, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var TypeKeyword$0 = $TS($S($EXPECT($L197, fail, 'TypeKeyword "type"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function TypeKeyword(state) {
@@ -20712,7 +20622,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Enum$0 = $TS($S($EXPECT($L197, fail, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Enum$0 = $TS($S($EXPECT($L198, fail, 'Enum "enum"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Enum(state) {
@@ -20737,7 +20647,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Interface$0 = $TS($S($EXPECT($L198, fail, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Interface$0 = $TS($S($EXPECT($L199, fail, 'Interface "interface"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Interface(state) {
@@ -20762,7 +20672,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Global$0 = $TS($S($EXPECT($L199, fail, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Global$0 = $TS($S($EXPECT($L200, fail, 'Global "global"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Global(state) {
@@ -20787,7 +20697,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Module$0 = $TS($S($EXPECT($L200, fail, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Module$0 = $TS($S($EXPECT($L201, fail, 'Module "module"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Module(state) {
@@ -20812,7 +20722,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Namespace$0 = $TS($S($EXPECT($L201, fail, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var Namespace$0 = $TS($S($EXPECT($L202, fail, 'Namespace "namespace"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Namespace(state) {
@@ -21506,7 +21416,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ReturnType$0 = $TS($S($E($S(__, $EXPECT($L202, fail, 'ReturnType "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2) {
+    var ReturnType$0 = $TS($S($E($S(__, $EXPECT($L203, fail, 'ReturnType "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2) {
       var asserts = $1;
       var t = $2;
       if (asserts) {
@@ -21546,7 +21456,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L151, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
+    var TypePredicate$0 = $TS($S(Type, $E($S(__, $EXPECT($L152, fail, 'TypePredicate "is"'), NonIdContinue, Type))), function($skip, $loc, $0, $1, $2) {
       var lhs = $1;
       var rhs = $2;
       if (!rhs)
@@ -21688,10 +21598,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeUnaryOp$0 = $S($EXPECT($L203, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
-    var TypeUnaryOp$1 = $S($EXPECT($L182, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
-    var TypeUnaryOp$2 = $S($EXPECT($L204, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
-    var TypeUnaryOp$3 = $S($EXPECT($L166, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
+    var TypeUnaryOp$0 = $S($EXPECT($L204, fail, 'TypeUnaryOp "keyof"'), NonIdContinue);
+    var TypeUnaryOp$1 = $S($EXPECT($L183, fail, 'TypeUnaryOp "typeof"'), NonIdContinue);
+    var TypeUnaryOp$2 = $S($EXPECT($L205, fail, 'TypeUnaryOp "infer"'), NonIdContinue);
+    var TypeUnaryOp$3 = $S($EXPECT($L167, fail, 'TypeUnaryOp "readonly"'), NonIdContinue);
     function TypeUnaryOp(state) {
       let eventData;
       if (state.events) {
@@ -21737,10 +21647,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypePrimary$0 = InterfaceBlock;
-    var TypePrimary$1 = $S($E(_), FunctionType);
-    var TypePrimary$2 = $S($E(_), InlineInterfaceLiteral);
-    var TypePrimary$3 = $S($E(_), TypeTuple);
+    var TypePrimary$0 = $S($E(_), TypeTuple);
+    var TypePrimary$1 = InterfaceBlock;
+    var TypePrimary$2 = $S($E(_), FunctionType);
+    var TypePrimary$3 = $S($E(_), InlineInterfaceLiteral);
     var TypePrimary$4 = $S($E(_), ImportType);
     var TypePrimary$5 = $TS($S($E(_), TypeLiteral), function($skip, $loc, $0, $1, $2) {
       var t = $2;
@@ -21853,25 +21763,34 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeElement$0 = $TS($S(__, IdentifierName, $E(_), DotDotDot, $S(__, $E($S(QuestionMark, $E(_))), Colon, __), Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var TypeElement$0 = $TS($S(__, $E($S(DotDotDot, __)), IdentifierName, $E($S($E(_), DotDotDot)), $S(__, $E($S(QuestionMark, $E(_))), Colon, __), Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var ws = $1;
-      var name = $2;
-      var space = $3;
-      var dots = $4;
+      var dots1 = $2;
+      var name = $3;
+      var dots2 = $4;
       var colon = $5;
       var type = $6;
-      return [ws, dots, space, name, colon, type];
+      let dots = dots1 || dots2 && [dots2[1], dots2[0]];
+      if (dots1 && dots2) {
+        dots = [dots, {
+          type: "Error",
+          message: "... both before and after identifier"
+        }];
+      }
+      return [ws, dots, name, colon, type];
     });
-    var TypeElement$1 = $TS($S(Type, $E(_), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
+    var TypeElement$1 = $S(__, DotDotDot, __, Type);
+    var TypeElement$2 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
       var type = $1;
-      var space = $2;
-      var dots = $3;
+      var spaceDots = $2;
+      if (!spaceDots)
+        return type;
+      const [space, dots] = spaceDots;
       const ws = getTrimmingSpace(type);
       if (!ws)
         return [dots, space, type];
       return [ws, dots, space, insertTrimmingSpace(type, "")];
     });
-    var TypeElement$2 = $S($E($S(__, DotDotDot)), $E($S(__, IdentifierName, __, $E($S(QuestionMark, $E(_))), Colon, __)), Type);
     function TypeElement(state) {
       let eventData;
       if (state.events) {
@@ -21945,7 +21864,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L140, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
+    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L141, fail, 'TypeConditional "extends"'), NonIdContinue, Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
       if ($2)
         return $0;
       return $1;
@@ -22077,10 +21996,10 @@ ${input.slice(result.pos)}
     }
     var TypeLiteral$0 = TypeTemplateLiteral;
     var TypeLiteral$1 = Literal;
-    var TypeLiteral$2 = $TS($S($EXPECT($L186, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var TypeLiteral$2 = $TS($S($EXPECT($L187, fail, 'TypeLiteral "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { type: "VoidType", $loc, token: $1 };
     });
-    var TypeLiteral$3 = $TV($EXPECT($L205, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+    var TypeLiteral$3 = $TV($EXPECT($L206, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "[]" };
     });
     function TypeLiteral(state) {
@@ -22261,7 +22180,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeArguments$0 = $TS($S($EXPECT($L155, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L34, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var TypeArguments$0 = $TS($S($EXPECT($L156, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L34, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       var args = $2;
       return { ts: true, types: args.map(([, t]) => t), children: $0 };
     });
@@ -22333,7 +22252,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameters$0 = $TS($S($E(_), $EXPECT($L155, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L34, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var TypeParameters$0 = $TS($S($E(_), $EXPECT($L156, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L34, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var parameters = $3;
       return {
         type: "TypeParameters",
@@ -22364,7 +22283,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameter$0 = $S(__, $E($S($EXPECT($L150, fail, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
+    var TypeParameter$0 = $S(__, $E($S($EXPECT($L151, fail, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
     function TypeParameter(state) {
       let eventData;
       if (state.events) {
@@ -22387,7 +22306,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeConstraint$0 = $S(__, $EXPECT($L140, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
+    var TypeConstraint$0 = $S(__, $EXPECT($L141, fail, 'TypeConstraint "extends"'), NonIdContinue, Type);
     function TypeConstraint(state) {
       let eventData;
       if (state.events) {
@@ -22538,7 +22457,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CivetPrologueContent$0 = $TS($S($EXPECT($L207, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
       var options = $3;
       return {
         type: "CivetPrologue",
@@ -22974,6 +22893,31 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var InsertSpaceEquals$0 = $TV($EXPECT($L0, fail, 'InsertSpaceEquals ""'), function($skip, $loc, $0, $1) {
+      return { $loc, token: " =" };
+    });
+    function InsertSpaceEquals(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("InsertSpaceEquals", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("InsertSpaceEquals", state, InsertSpaceEquals$0(state));
+        if (state.events)
+          state.events.exit?.("InsertSpaceEquals", state, result, eventData);
+        return result;
+      } else {
+        const result = InsertSpaceEquals$0(state);
+        if (state.events)
+          state.events.exit?.("InsertSpaceEquals", state, result, eventData);
+        return result;
+      }
+    }
     var InsertConst$0 = $TV($EXPECT($L0, fail, 'InsertConst ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "const " };
     });
@@ -23586,7 +23530,6 @@ ${input.slice(result.pos)}
       module.forbidIndentedApplication = [false];
       module.forbidBracedApplication = [false];
       module.forbidTrailingMemberProperty = [false];
-      module.forbidMultiLineImplicitObjectLiteral = [false];
       module.forbidNewlineBinaryOp = [false];
       module.JSXTagStack = [];
       module.operators = /* @__PURE__ */ new Set();
@@ -23623,12 +23566,6 @@ ${input.slice(result.pos)}
               return s[s.length - 1];
             }
           },
-          multiLineImplicitObjectLiteralForbidden: {
-            get() {
-              const { forbidMultiLineImplicitObjectLiteral: s } = module;
-              return s[s.length - 1];
-            }
-          },
           newlineBinaryOpForbidden: {
             get() {
               const { forbidNewlineBinaryOp: s } = module;
@@ -23763,11 +23700,7 @@ ${input.slice(result.pos)}
       module.getRef = function(base) {
         if (refs.hasOwnProperty(base))
           return refs[base];
-        const ref = {
-          type: "Ref",
-          base,
-          id: base
-        };
+        const ref = makeRef(base);
         if (declareRef.hasOwnProperty(base))
           declareRef[base](ref);
         return refs[base] = ref;
@@ -23931,19 +23864,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Samedent$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
-      var indent = $2;
-      const { level } = indent;
-      const currentIndentLevel = module.currentIndent.level;
-      if (level === currentIndentLevel) {
-        return $0;
-      }
-      return $skip;
-    });
-    function Samedent(state) {
+    var PushIndent$0 = $Y($S(EOS, TrackIndented));
+    function PushIndent(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("Samedent", state);
+        const result = state.events.enter?.("PushIndent", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -23951,30 +23876,27 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("Samedent", state, Samedent$0(state));
+        const result = $TOKEN("PushIndent", state, PushIndent$0(state));
         if (state.events)
-          state.events.exit?.("Samedent", state, result, eventData);
+          state.events.exit?.("PushIndent", state, result, eventData);
         return result;
       } else {
-        const result = Samedent$0(state);
+        const result = PushIndent$0(state);
         if (state.events)
-          state.events.exit?.("Samedent", state, result, eventData);
+          state.events.exit?.("PushIndent", state, result, eventData);
         return result;
       }
     }
-    var IndentedFurther$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
-      var indent = $2;
-      const { level } = indent;
-      const currentIndentLevel = module.currentIndent.level;
-      if (level > currentIndentLevel) {
-        return $0;
+    var PopIndent$0 = $TV($EXPECT($L0, fail, 'PopIndent ""'), function($skip, $loc, $0, $1) {
+      if (module.config.verbose) {
+        console.log("popping indent", module.indentLevels[module.indentLevels.length - 1], "->", module.indentLevels[module.indentLevels.length - 2]);
       }
-      return $skip;
+      module.indentLevels.pop();
     });
-    function IndentedFurther(state) {
+    function PopIndent(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("IndentedFurther", state);
+        const result = state.events.enter?.("PopIndent", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -23982,29 +23904,30 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("IndentedFurther", state, IndentedFurther$0(state));
+        const result = $TOKEN("PopIndent", state, PopIndent$0(state));
         if (state.events)
-          state.events.exit?.("IndentedFurther", state, result, eventData);
+          state.events.exit?.("PopIndent", state, result, eventData);
         return result;
       } else {
-        const result = IndentedFurther$0(state);
+        const result = PopIndent$0(state);
         if (state.events)
-          state.events.exit?.("IndentedFurther", state, result, eventData);
+          state.events.exit?.("PopIndent", state, result, eventData);
         return result;
       }
     }
-    var NotDedented$0 = $TS($S($E($C(Samedent, IndentedFurther)), $E(_)), function($skip, $loc, $0, $1, $2) {
-      const ws = [];
-      if ($1)
-        ws.push(...$1);
-      if ($2)
-        ws.push(...$2);
-      return ws.flat(Infinity).filter(Boolean);
+    var Nested$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
+      var indent = $2;
+      if (indent.level === module.currentIndent.level)
+        return $0;
+      if (module.config.verbose) {
+        console.log(`failing Nested: ${indent.level} does not match current indent level ${module.currentIndent.level}`);
+      }
+      return $skip;
     });
-    function NotDedented(state) {
+    function Nested(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("NotDedented", state);
+        const result = state.events.enter?.("Nested", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -24012,24 +23935,27 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("NotDedented", state, NotDedented$0(state));
+        const result = $TOKEN("Nested", state, Nested$0(state));
         if (state.events)
-          state.events.exit?.("NotDedented", state, result, eventData);
+          state.events.exit?.("Nested", state, result, eventData);
         return result;
       } else {
-        const result = NotDedented$0(state);
+        const result = Nested$0(state);
         if (state.events)
-          state.events.exit?.("NotDedented", state, result, eventData);
+          state.events.exit?.("Nested", state, result, eventData);
         return result;
       }
     }
-    var Dedented$0 = $T($S($N($C(Samedent, IndentedFurther)), EOS), function(value) {
-      return value[1];
+    var IndentedFurther$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
+      var indent = $2;
+      if (indent.level > module.currentIndent.level)
+        return $0;
+      return $skip;
     });
-    function Dedented(state) {
+    function IndentedFurther(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("Dedented", state);
+        const result = state.events.enter?.("IndentedFurther", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -24037,22 +23963,27 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("Dedented", state, Dedented$0(state));
+        const result = $TOKEN("IndentedFurther", state, IndentedFurther$0(state));
         if (state.events)
-          state.events.exit?.("Dedented", state, result, eventData);
+          state.events.exit?.("IndentedFurther", state, result, eventData);
         return result;
       } else {
-        const result = Dedented$0(state);
+        const result = IndentedFurther$0(state);
         if (state.events)
-          state.events.exit?.("Dedented", state, result, eventData);
+          state.events.exit?.("IndentedFurther", state, result, eventData);
         return result;
       }
     }
-    var PushIndent$0 = $Y($S(EOS, TrackIndented));
-    function PushIndent(state) {
+    var IndentedAtLeast$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
+      var indent = $2;
+      if (indent.level >= module.currentIndent.level)
+        return $0;
+      return $skip;
+    });
+    function IndentedAtLeast(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("PushIndent", state);
+        const result = state.events.enter?.("IndentedAtLeast", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -24060,27 +23991,29 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("PushIndent", state, PushIndent$0(state));
+        const result = $TOKEN("IndentedAtLeast", state, IndentedAtLeast$0(state));
         if (state.events)
-          state.events.exit?.("PushIndent", state, result, eventData);
+          state.events.exit?.("IndentedAtLeast", state, result, eventData);
         return result;
       } else {
-        const result = PushIndent$0(state);
+        const result = IndentedAtLeast$0(state);
         if (state.events)
-          state.events.exit?.("PushIndent", state, result, eventData);
+          state.events.exit?.("IndentedAtLeast", state, result, eventData);
         return result;
       }
     }
-    var PopIndent$0 = $TV($EXPECT($L0, fail, 'PopIndent ""'), function($skip, $loc, $0, $1) {
-      if (module.config.verbose) {
-        console.log("popping indent", module.indentLevels[module.indentLevels.length - 1], "->", module.indentLevels[module.indentLevels.length - 2]);
-      }
-      module.indentLevels.pop();
+    var NotDedented$0 = $TS($S($E(IndentedAtLeast), $E(_)), function($skip, $loc, $0, $1, $2) {
+      const ws = [];
+      if ($1)
+        ws.push(...$1);
+      if ($2)
+        ws.push(...$2);
+      return ws.flat(Infinity).filter(Boolean);
     });
-    function PopIndent(state) {
+    function NotDedented(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("PopIndent", state);
+        const result = state.events.enter?.("NotDedented", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -24088,37 +24021,24 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("PopIndent", state, PopIndent$0(state));
+        const result = $TOKEN("NotDedented", state, NotDedented$0(state));
         if (state.events)
-          state.events.exit?.("PopIndent", state, result, eventData);
+          state.events.exit?.("NotDedented", state, result, eventData);
         return result;
       } else {
-        const result = PopIndent$0(state);
+        const result = NotDedented$0(state);
         if (state.events)
-          state.events.exit?.("PopIndent", state, result, eventData);
+          state.events.exit?.("NotDedented", state, result, eventData);
         return result;
       }
     }
-    var Nested$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
-      var eos = $1;
-      var indent = $2;
-      const { level } = indent;
-      const currentIndent = module.currentIndent;
-      if (module.config.verbose) {
-        console.log("Indented", level, currentIndent);
-      }
-      if (level !== currentIndent.level) {
-        if (module.config.verbose) {
-          console.log("skipped nested");
-        }
-        return $skip;
-      }
-      return $0;
+    var Dedented$0 = $T($S($N(IndentedAtLeast), EOS), function(value) {
+      return value[1];
     });
-    function Nested(state) {
+    function Dedented(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("Nested", state);
+        const result = state.events.enter?.("Dedented", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -24126,14 +24046,14 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("Nested", state, Nested$0(state));
+        const result = $TOKEN("Dedented", state, Dedented$0(state));
         if (state.events)
-          state.events.exit?.("Nested", state, result, eventData);
+          state.events.exit?.("Dedented", state, result, eventData);
         return result;
       } else {
-        const result = Nested$0(state);
+        const result = Dedented$0(state);
         if (state.events)
-          state.events.exit?.("Nested", state, result, eventData);
+          state.events.exit?.("Dedented", state, result, eventData);
         return result;
       }
     }
@@ -24161,12 +24081,14 @@ ${input.slice(result.pos)}
       literalValue,
       makeEmptyBlock,
       makeLeftHandSideExpression,
+      makeRef,
       maybeRef,
       modifyString,
+      processAssignmentDeclaration,
       processBinaryOpExpression,
       processCallMemberExpression,
       processCoffeeInterpolation,
-      processAssignmentDeclaration,
+      processForInOf,
       processProgram,
       processUnaryExpression,
       quoteString,
@@ -24601,7 +24523,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowBracedApplication", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedApplicationAllowed", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "ConditionFragment", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExpressionWithObjectApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidBracedApplication", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonPipelineAssignmentExpression", "NonPipelineExtendedExpression", "NonPipelinePostfixedExpression", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PatternExpressionList", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreBracedApplication", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
+uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowBracedApplication", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedApplicationAllowed", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "ConditionFragment", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExpressionWithObjectApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidBracedApplication", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedAtLeast", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonPipelineArgumentPart", "NonPipelineArgumentList", "NonPipelineAssignmentExpression", "NonPipelineExtendedExpression", "NonPipelinePostfixedExpression", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PatternExpressionList", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreBracedApplication", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options) {
   var ast, code, events, filename, ref, result, sm;
   if (!options) {