@danielx/civet 0.6.18 → 0.6.20

package/dist/browser.js

@@ -157,15 +157,8 @@ var Civet = (() => {
         }
       }
       function arrayElementHasTrailingComma(elementNode) {
-        const { children } = elementNode, { length } = children;
-        const lastChild = children[length - 1];
-        if (lastChild) {
-          const l2 = lastChild.length;
-          if (lastChild[l2 - 1]?.token === ",") {
-            return true;
-          }
-        }
-        return false;
+        const lastChild = elementNode.children.at(-1);
+        return lastChild && lastChild[lastChild.length - 1]?.token === ",";
       }
       var assert = {
         equal(a, b, msg) {
@@ -592,7 +585,15 @@ var Civet = (() => {
           case "EmptyStatement":
           case "ReturnStatement":
           case "ThrowStatement":
+            return;
           case "Declaration":
+            exp.children.push(["", [
+              ";",
+              ref,
+              ".push(",
+              patternAsValue(exp.bindings.at(-1).pattern),
+              ")"
+            ]]);
             return;
           case "ForStatement":
           case "IterationStatement":
@@ -845,6 +846,39 @@ var Civet = (() => {
         const indent = expressions[index][0];
         expressions.splice(index, 0, [indent, dec, ";"]);
       }
+      function patternAsValue(pattern) {
+        switch (pattern.type) {
+          case "ArrayBindingPattern": {
+            const children = [...pattern.children];
+            const index = children.indexOf(pattern.elements);
+            if (index < 0)
+              throw new Error("failed to find elements in ArrayBindingPattern");
+            children[index] = pattern.elements.map((el) => {
+              const [ws, e, delim] = el.children;
+              return { ...el, children: [ws, patternAsValue(e), delim] };
+            });
+            return { ...pattern, children };
+          }
+          case "ObjectBindingPattern": {
+            const children = [...pattern.children];
+            const index = children.indexOf(pattern.properties);
+            if (index < 0)
+              throw new Error("failed to find properties in ArrayBindingPattern");
+            children[index] = pattern.properties.map(patternAsValue);
+            return { ...pattern, children };
+          }
+          case "Identifier":
+          case "BindingProperty": {
+            const children = [pattern.name, pattern.delim];
+            if (isWhitespaceOrEmpty(pattern.children[0])) {
+              children.unshift(pattern.children[0]);
+            }
+            return { ...pattern, children };
+          }
+          default:
+            return pattern;
+        }
+      }
       function insertReturn(node) {
         if (!node)
           return;
@@ -886,7 +920,12 @@ var Civet = (() => {
           case "EmptyStatement":
           case "ReturnStatement":
           case "ThrowStatement":
+            return;
           case "Declaration":
+            exp.children.push(["", {
+              type: "ReturnStatement",
+              children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)]
+            }]);
             return;
           case "ForStatement":
           case "IterationStatement":
@@ -1301,72 +1340,59 @@ var Civet = (() => {
           children: [s, parts, e]
         };
       }
-      function processConstAssignmentDeclaration(c, id, suffix, ws, ca, e) {
-        c = {
-          ...c,
+      function processAssignmentDeclaration(decl, id, suffix, ws, assign, e) {
+        decl = {
+          ...decl,
           $loc: {
-            pos: ca.$loc.pos - 1,
-            length: ca.$loc.length + 1
+            pos: assign.$loc.pos - 1,
+            length: assign.$loc.length + 1
           }
         };
-        let exp;
-        if (e.type === "FunctionExpression") {
-          exp = e;
-        } else {
-          exp = e[1];
-        }
-        if (exp?.children?.[0]?.token?.match(/^\s+$/))
-          exp.children.shift();
-        if (id.type === "Identifier" && exp?.type === "FunctionExpression" && !exp.id) {
-          const i = exp.children.findIndex((c2) => c2?.token === "function") + 1;
-          exp = {
-            ...exp,
-            children: [...exp.children.slice(0, i), " ", id, suffix, ws, ...exp.children.slice(i)]
-          };
-          return {
-            type: "Declaration",
-            children: [exp],
-            names: id.names
-          };
+        if (decl.token.startsWith("const")) {
+          let exp;
+          if (e.type === "FunctionExpression") {
+            exp = e;
+          } else {
+            exp = e[1];
+          }
+          if (exp?.children?.[0]?.token?.match(/^\s+$/))
+            exp.children.shift();
+          if (id.type === "Identifier" && exp?.type === "FunctionExpression" && !exp.id) {
+            const i = exp.children.findIndex((c) => c?.token === "function") + 1;
+            exp = {
+              ...exp,
+              children: [...exp.children.slice(0, i), " ", id, suffix, ws, ...exp.children.slice(i)]
+            };
+            return {
+              type: "Declaration",
+              decl,
+              children: [exp],
+              names: id.names
+            };
+          }
         }
         let [splices, thisAssignments] = gatherBindingCode(id);
         splices = splices.map((s) => [", ", s]);
         thisAssignments = thisAssignments.map((a) => ["", a, ";"]);
-        const binding = [c, id, suffix, ...ws];
-        const initializer = [ca, e];
-        const children = [binding, initializer];
-        return {
-          type: "Declaration",
-          names: id.names,
-          children,
-          binding,
+        const initializer = [ws, assign, e];
+        const binding = {
+          type: "Binding",
+          pattern: id,
           initializer,
           splices,
-          thisAssignments
-        };
-      }
-      function processLetAssignmentDeclaration(l, id, suffix, ws, la, e) {
-        l = {
-          ...l,
-          $loc: {
-            pos: la.$loc.pos - 1,
-            length: la.$loc.length + 1
-          }
+          suffix,
+          thisAssignments,
+          children: [id, suffix, initializer]
         };
-        let [splices, thisAssignments] = gatherBindingCode(id);
-        splices = splices.map((s) => [", ", s]);
-        thisAssignments = thisAssignments.map((a) => ["", a, ";"]);
-        const binding = [l, id, suffix, ...ws];
-        const initializer = [la, e];
-        const children = [binding, initializer];
+        const children = [decl, binding];
         return {
           type: "Declaration",
           names: id.names,
-          children,
-          binding,
-          initializer,
+          decl,
+          bindings: [binding],
           splices,
-          thisAssignments
+          thisAssignments,
+          children
         };
       }
       function implicitFunctionBlock(f) {
@@ -1577,9 +1603,9 @@ var Civet = (() => {
               const subRef = [ref, "[", i.toString(), "]"];
               getPatternConditions(e, subRef, conditions);
             });
-            const postRest = pattern.children.find((c) => c?.blockPrefix);
-            if (postRest) {
-              const postElements = postRest.blockPrefix.children[1], { length: postLength } = postElements;
+            const { blockPrefix } = pattern;
+            if (blockPrefix) {
+              const postElements = blockPrefix.children[1], { length: postLength } = postElements;
               postElements.forEach(({ children: [, e] }, i) => {
                 const subRef = [ref, "[", ref, ".length - ", (postLength + i).toString(), "]"];
                 getPatternConditions(e, subRef, conditions);
@@ -1666,15 +1692,15 @@ var Civet = (() => {
           if (el.type === "BindingRestElement") {
             return ["", el, void 0];
           }
-          const { children: [ws, e, sep] } = el;
+          const { children: [ws, e, delim] } = el;
           switch (e.type) {
             case "Literal":
             case "RegularExpressionLiteral":
             case "StringLiteral":
             case "PinPattern":
-              return sep;
+              return delim;
             default:
-              return [ws, nonMatcherBindings(e), sep];
+              return [ws, nonMatcherBindings(e), delim];
           }
         });
       }
@@ -1684,13 +1710,12 @@ var Civet = (() => {
             case "BindingProperty": {
               const { children, name, value } = p;
               const [ws] = children;
-              const sep = children[children.length - 1];
               switch (value && value.type) {
                 case "ArrayBindingPattern":
                 case "ObjectBindingPattern":
                   return {
                     ...p,
-                    children: [ws, name, ": ", nonMatcherBindings(value)]
+                    children: [ws, name, ": ", nonMatcherBindings(value), p.delim]
                   };
                 case "Identifier":
                   return p;
@@ -1700,7 +1725,7 @@ var Civet = (() => {
                 default:
                   return {
                     ...p,
-                    children: [ws, name, sep]
+                    children: [ws, name, p.delim]
                   };
               }
             }
@@ -2040,10 +2065,11 @@ var Civet = (() => {
         });
       }
       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;
@@ -2370,9 +2396,20 @@ var Civet = (() => {
           let rest = props[restIndex];
           props = props.slice(0, restIndex);
           if (after.length) {
-            const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
-            rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
-            after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+            const { delim: restDelim } = rest, lastAfterProp = after[after.length - 1], { delim: lastDelim, children: lastAfterChildren } = lastAfterProp;
+            rest = {
+              ...rest,
+              delim: lastDelim,
+              children: [...rest.children.slice(0, -1), lastDelim]
+            };
+            after = [
+              ...after.slice(0, -1),
+              {
+                ...lastAfterProp,
+                delim: restDelim,
+                children: [...lastAfterChildren.slice(0, -1), restDelim]
+              }
+            ];
           }
           const children = [...props, ...after, rest];
           return {
@@ -2552,8 +2589,7 @@ var Civet = (() => {
         processBinaryOpExpression,
         processCallMemberExpression,
         processCoffeeInterpolation,
-        processConstAssignmentDeclaration,
-        processLetAssignmentDeclaration,
+        processAssignmentDeclaration,
         processParams,
         processProgram,
         processReturnValue,
@@ -3094,7 +3130,6 @@ ${input.slice(result.pos)}
         BindingProperty,
         BindingRestProperty,
         NestedBindingElements,
-        NestedBindingElement,
         BindingElement,
         BindingRestElement,
         EmptyBindingPattern,
@@ -3158,10 +3193,8 @@ ${input.slice(result.pos)}
         InlineObjectLiteral,
         ImplicitInlineObjectPropertyDelimiter,
         ObjectPropertyDelimiter,
-        PropertyDefinitionList,
         PropertyDefinition,
         NamedProperty,
-        ImplicitNamedProperty,
         SnugNamedProperty,
         PropertyName,
         ComputedPropertyName,
@@ -3267,10 +3300,6 @@ ${input.slice(result.pos)}
         AllowTrailingMemberProperty,
         RestoreTrailingMemberProperty,
         TrailingMemberPropertyAllowed,
-        ForbidMultiLineImplicitObjectLiteral,
-        AllowMultiLineImplicitObjectLiteral,
-        RestoreMultiLineImplicitObjectLiteral,
-        MultiLineImplicitObjectLiteralAllowed,
         AllowNewlineBinaryOp,
         ForbidNewlineBinaryOp,
         RestoreNewlineBinaryOp,
@@ -3316,7 +3345,6 @@ ${input.slice(result.pos)}
         Initializer,
         VariableStatement,
         VariableDeclarationList,
-        VariableDeclaration,
         NumericLiteral,
         NumericLiteralKind,
         DecimalBigIntegerLiteral,
@@ -3505,6 +3533,7 @@ ${input.slice(result.pos)}
         NestedJSXChildExpression,
         TypeDeclaration,
         TypeDeclarationRest,
+        OptionalEquals,
         TypeLexicalDeclaration,
         TypeDeclarationBinding,
         InterfaceExtendsClause,
@@ -3593,6 +3622,7 @@ ${input.slice(result.pos)}
         InsertOpenBracket,
         InsertCloseBracket,
         InsertComma,
+        InsertSpaceEquals,
         InsertConst,
         InsertLet,
         InsertReadonly,
@@ -3620,13 +3650,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("{");
@@ -4470,7 +4500,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) {
@@ -4521,7 +4551,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) {
@@ -4569,7 +4599,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) {
@@ -7342,7 +7372,7 @@ ${input.slice(result.pos)}
         var c = $3;
         return {
           type: "ObjectBindingPattern",
-          children: $0,
+          children: [$1, $2, c.children, $4, $5],
           names: c.names,
           properties: c.children
         };
@@ -7403,6 +7433,7 @@ ${input.slice(result.pos)}
         return props.map(([prop, delim]) => {
           return {
             ...prop,
+            delim,
             children: [...prop.children, delim]
           };
         });
@@ -7432,11 +7463,10 @@ ${input.slice(result.pos)}
       var ArrayBindingPattern$0 = $TS($S($E(_), OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var c = $3;
         return {
+          ...c,
           type: "ArrayBindingPattern",
-          children: $0,
-          names: c.names,
           elements: c.children,
-          length: c.length
+          children: [$1, $2, c.children, $4, $5]
         };
       });
       function ArrayBindingPattern(state) {
@@ -7522,14 +7552,14 @@ ${input.slice(result.pos)}
         }
       }
       var NestedBindingElementList$0 = $TS($S(Nested, BindingElementList), function($skip, $loc, $0, $1, $2) {
-        var ws = $1;
+        var indent = $1;
         var elements = $2;
         return elements.map((element, i) => {
           if (i > 0)
             return element;
           return {
             ...element,
-            children: [ws, ...element.children]
+            children: [indent, ...element.children.slice(1)]
           };
         });
       });
@@ -7644,13 +7674,13 @@ ${input.slice(result.pos)}
       var BindingProperty$1 = $TS($S($E(_), PropertyName, $E(_), Colon, $E(_), $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
         var name = $2;
         var value = $6;
-        var init = $7;
+        var initializer = $7;
         return {
           type: "BindingProperty",
           children: $0,
           name,
           value,
-          init,
+          initializer,
           names: value.names
         };
       });
@@ -7658,14 +7688,14 @@ ${input.slice(result.pos)}
         var ws = $1;
         var pin = $2;
         var binding = $3;
-        var init = $4;
+        var initializer = $4;
         if (binding.type === "AtBinding") {
           return {
             type: "AtBindingProperty",
             children: $0,
             binding,
             ref: binding.ref,
-            init,
+            initializer,
             names: []
           };
         }
@@ -7685,7 +7715,7 @@ ${input.slice(result.pos)}
           children: $0,
           name: binding,
           value: void 0,
-          init,
+          initializer,
           names: binding.names,
           identifier: binding
         };
@@ -7782,36 +7812,6 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var NestedBindingElement$0 = $TS($S(Nested, BindingElement), function($skip, $loc, $0, $1, $2) {
-        var indent = $1;
-        var element = $2;
-        return {
-          ...element,
-          children: [indent, ...element.children]
-        };
-      });
-      function NestedBindingElement(state) {
-        let eventData;
-        if (state.events) {
-          const result = state.events.enter?.("NestedBindingElement", state);
-          if (result) {
-            if (result.cache)
-              return result.cache;
-            eventData = result.data;
-          }
-        }
-        if (state.tokenize) {
-          const result = $TOKEN("NestedBindingElement", state, NestedBindingElement$0(state));
-          if (state.events)
-            state.events.exit?.("NestedBindingElement", state, result, eventData);
-          return result;
-        } else {
-          const result = NestedBindingElement$0(state);
-          if (state.events)
-            state.events.exit?.("NestedBindingElement", state, result, eventData);
-          return result;
-        }
-      }
       var BindingElement$0 = BindingRestElement;
       var BindingElement$1 = $TS($S($E(_), $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
         var ws = $1;
@@ -7820,6 +7820,7 @@ ${input.slice(result.pos)}
         if (binding.children) {
           binding = {
             ...binding,
+            initializer,
             children: [...binding.children, initializer]
           };
         }
@@ -7865,7 +7866,7 @@ ${input.slice(result.pos)}
         var binding = $3;
         return {
           type: "BindingRestElement",
-          children: [...ws || [], dots, binding],
+          children: [ws, [dots, binding]],
           binding,
           name: binding.name,
           names: binding.names,
@@ -8754,7 +8755,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",
@@ -8829,16 +8830,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
         };
       });
@@ -9294,9 +9295,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,
@@ -9412,17 +9411,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;
@@ -9570,9 +9569,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,
@@ -9609,7 +9608,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) {
@@ -9724,26 +9723,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) {
@@ -9768,8 +9757,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) {
@@ -9793,9 +9807,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) {
@@ -9848,7 +9864,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;
@@ -9951,7 +9967,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;
@@ -9985,7 +10001,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) {
@@ -10037,41 +10053,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;
@@ -10084,7 +10066,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 {
@@ -10092,7 +10074,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;
@@ -10105,7 +10087,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)
@@ -10115,7 +10097,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;
@@ -10127,9 +10109,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] };
@@ -10250,41 +10232,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,
@@ -10860,7 +10809,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);
@@ -11648,7 +11597,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;
@@ -11792,7 +11741,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) {
@@ -12896,7 +12845,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",
@@ -13113,11 +13062,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)
@@ -13310,7 +13257,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",
@@ -13364,7 +13311,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) {
@@ -13476,17 +13423,19 @@ ${input.slice(result.pos)}
           type: "Ref",
           base: "ref"
         };
-        const { binding, initializer, splices, thisAssignments } = dec;
+        const { decl, bindings } = dec;
+        const binding = bindings[0];
+        const { pattern, suffix, initializer, splices, thisAssignments } = binding;
         const initCondition = {
           type: "AssignmentExpression",
-          children: [ref, " ", initializer],
+          children: [ref, initializer],
           hoistDec: {
             type: "Declaration",
-            children: ["let ", ref],
+            children: ["let ", ref, suffix],
             names: []
           },
           blockPrefix: [
-            ["", [binding, "= ", ref, ...splices], ";"],
+            ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
             ...thisAssignments
           ]
         };
@@ -13986,110 +13935,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);
       });
@@ -14194,7 +14039,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) {
@@ -14217,7 +14062,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) {
@@ -15185,26 +15030,23 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var LexicalDeclaration$0 = $TS($S(LetOrConst, LexicalBinding, $Q($S(__, Comma, LexicalBinding))), function($skip, $loc, $0, $1, $2, $3) {
-        var d = $1;
+      var LexicalDeclaration$0 = $TS($S(LetOrConst, LexicalBinding, $Q($S(__, Comma, __, LexicalBinding))), function($skip, $loc, $0, $1, $2, $3) {
+        var decl = $1;
         var binding = $2;
         var tail = $3;
-        const { splices, thisAssignments } = binding;
+        const bindings = [binding].concat(tail.map(([, , , b]) => b));
         return {
           type: "Declaration",
           children: $0,
-          names: [...binding.names].concat(tail.flatMap(([, , b]) => b.names)),
-          binding: {
-            ...binding.binding,
-            children: [d, ...binding.binding.children]
-          },
-          initializer: binding.initializer,
-          splices,
-          thisAssignments
+          names: bindings.flatMap((b) => b.names),
+          bindings,
+          decl,
+          splices: bindings.flatMap((b) => b.splices),
+          thisAssignments: bindings.flatMap((b) => b.thisAssignments)
         };
       });
       var LexicalDeclaration$1 = $TS($S(InsertConst, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-        return processConstAssignmentDeclaration(...$0);
+        return processAssignmentDeclaration(...$0);
       });
       var LexicalDeclaration$2 = $TS($S(InsertLet, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, LetAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var l = $1;
@@ -15213,7 +15055,7 @@ ${input.slice(result.pos)}
         var ws = $4;
         var la = $5;
         var e = $6;
-        return processLetAssignmentDeclaration(...$0);
+        return processAssignmentDeclaration(...$0);
       });
       function LexicalDeclaration(state) {
         let eventData;
@@ -15287,48 +15129,32 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var LexicalBinding$0 = $TS($S(BindingPattern, $E(TypeSuffix), $E(_), Initializer), function($skip, $loc, $0, $1, $2, $3, $4) {
-        var binding = $1;
+      var LexicalBinding$0 = $TS($S(BindingPattern, $E(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
+        var pattern = $1;
         var suffix = $2;
-        var ws = $3;
-        var initializer = $4;
-        const bindingChildren = [...binding.children];
-        if (suffix)
-          bindingChildren.push(suffix);
-        if (ws)
-          bindingChildren.push(...ws);
-        binding = {
-          ...binding,
-          children: bindingChildren
-        };
-        const [splices, thisAssignments] = gatherBindingCode(binding.children);
+        var initializer = $3;
+        const [splices, thisAssignments] = gatherBindingCode(pattern);
         return {
-          children: [binding, initializer],
-          names: binding.names,
-          binding,
+          type: "Binding",
+          children: $0,
+          names: pattern.names,
+          pattern,
+          suffix,
           initializer,
           splices: splices.map((s) => [",", s]),
           thisAssignments: thisAssignments.map((s) => ["", s, ";"])
         };
       });
-      var LexicalBinding$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(_), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
-        var binding = $1;
+      var LexicalBinding$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
+        var pattern = $1;
         var suffix = $2;
-        var ws = $3;
-        var initializer = $4;
-        const bindingChildren = [...binding.children];
-        if (suffix)
-          bindingChildren.push(suffix);
-        if (ws)
-          bindingChildren.push(...ws);
-        binding = {
-          ...binding,
-          children: bindingChildren
-        };
+        var initializer = $3;
         return {
-          children: [binding, initializer],
-          names: binding.names,
-          binding,
+          type: "Binding",
+          children: $0,
+          names: pattern.names,
+          pattern,
+          suffix,
           initializer,
           splices: [],
           thisAssignments: []
@@ -15380,9 +15206,10 @@ ${input.slice(result.pos)}
         }
       }
       var VariableStatement$0 = $TS($S(Var, __, VariableDeclarationList), function($skip, $loc, $0, $1, $2, $3) {
-        return Object.assign({}, $3, {
+        return {
+          ...$3,
           children: [$1, ...$2, ...$3.children]
-        });
+        };
       });
       function VariableStatement(state) {
         let eventData;
@@ -15406,18 +15233,15 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var VariableDeclarationList$0 = $TS($S(VariableDeclaration, $Q($S(__, Comma, __, VariableDeclaration))), function($skip, $loc, $0, $1, $2) {
-        let children;
-        if ($2.length) {
-          children = [$1, ...$2];
-        } else {
-          children = [$1];
-        }
-        const names = children.flatMap((c) => c.names || []);
+      var VariableDeclarationList$0 = $TS($S(LexicalBinding, $Q($S(__, Comma, __, LexicalBinding))), function($skip, $loc, $0, $1, $2) {
+        var binding = $1;
+        var tail = $2;
+        const bindings = [binding].concat(tail.map(([, , , b]) => b));
         return {
           type: "Declaration",
-          children,
-          names
+          children: [binding, ...tail],
+          bindings,
+          names: bindings.flatMap((b) => b.names)
         };
       });
       function VariableDeclarationList(state) {
@@ -15442,49 +15266,6 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var VariableDeclaration$0 = $TS($S(BindingPattern, $E(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
-        const children = [...$1.children];
-        if ($2)
-          children.push($2);
-        children.push($3);
-        return {
-          children,
-          names: $1.names
-        };
-      });
-      var VariableDeclaration$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
-        const children = [...$1.children];
-        if ($2)
-          children.push($2);
-        if ($3)
-          children.push($3);
-        return {
-          children,
-          names: $1.names
-        };
-      });
-      function VariableDeclaration(state) {
-        let eventData;
-        if (state.events) {
-          const result = state.events.enter?.("VariableDeclaration", state);
-          if (result) {
-            if (result.cache)
-              return result.cache;
-            eventData = result.data;
-          }
-        }
-        if (state.tokenize) {
-          const result = $TOKEN("VariableDeclaration", state, VariableDeclaration$0(state) || VariableDeclaration$1(state));
-          if (state.events)
-            state.events.exit?.("VariableDeclaration", state, result, eventData);
-          return result;
-        } else {
-          const result = VariableDeclaration$0(state) || VariableDeclaration$1(state);
-          if (state.events)
-            state.events.exit?.("VariableDeclaration", state, result, eventData);
-          return result;
-        }
-      }
       var NumericLiteral$0 = $TS($S(NumericLiteralKind), function($skip, $loc, $0, $1) {
         return { type: "NumericLiteral", $loc, token: $1 };
       });
@@ -16884,7 +16665,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;
@@ -19105,7 +18886,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: [
@@ -20625,7 +20406,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;
@@ -20651,6 +20432,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;
@@ -21245,9 +21052,9 @@ ${input.slice(result.pos)}
               ["let ", id, " = {};\n"],
               ...block.properties.map((property, i) => {
                 let init, isString;
-                if (property.init) {
+                if (property.initializer) {
                   init = replaceNodes(
-                    deepCopy(property.init),
+                    deepCopy(property.initializer),
                     (n) => n.type === "Identifier" && names.has(n.name),
                     (n) => [id, '["', n.name, '"]']
                   );
@@ -21410,11 +21217,11 @@ ${input.slice(result.pos)}
       }
       var EnumProperty$0 = $TS($S(Identifier, $E($S(__, Equals, ExtendedExpression)), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
         var name = $1;
-        var init = $2;
+        var initializer = $2;
         return {
           type: "EnumProperty",
           name,
-          init,
+          initializer,
           children: $0
         };
       });
@@ -21798,10 +21605,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;
@@ -21914,25 +21721,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) {
@@ -23035,6 +22851,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 " };
       });
@@ -23647,7 +23488,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();
@@ -23684,12 +23524,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;
@@ -23992,19 +23826,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;
@@ -24012,30 +23838,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;
@@ -24043,29 +23866,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;
@@ -24073,24 +23897,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;
@@ -24098,22 +23925,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;
@@ -24121,27 +23953,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;
@@ -24149,37 +23983,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;
@@ -24187,14 +24008,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;
         }
       }
@@ -24227,8 +24048,7 @@ ${input.slice(result.pos)}
         processBinaryOpExpression,
         processCallMemberExpression,
         processCoffeeInterpolation,
-        processConstAssignmentDeclaration,
-        processLetAssignmentDeclaration,
+        processAssignmentDeclaration,
         processProgram,
         processUnaryExpression,
         quoteString,
@@ -24672,7 +24492,7 @@ ${input.slice(result.pos)}
   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) {