@danielx/civet 0.4.19-pre.6 → 0.4.19-pre.8

package/dist/main.js

@@ -488,6 +488,8 @@ var require_parser = __commonJS({
       FunctionExpression,
       ThinArrowFunction,
       Arrow,
+      ExplicitBlock,
+      ImplicitNestedBlock,
       Block,
       ThenClause,
       BracedOrEmptyBlock,
@@ -813,38 +815,38 @@ var require_parser = __commonJS({
       Reset,
       Init,
       Indent,
-      TrackIndent,
+      TrackIndented,
       Samedent,
       IndentedFurther,
       PushIndent,
       PopIndent,
       Nested
     });
-    var $L0 = $L("");
-    var $L1 = $L("++");
-    var $L2 = $L("--");
-    var $L3 = $L("=>");
-    var $L4 = $L("<");
-    var $L5 = $L("extends");
-    var $L6 = $L("this");
-    var $L7 = $L("#");
-    var $L8 = $L(".");
-    var $L9 = $L("super");
-    var $L10 = $L("import");
-    var $L11 = $L("!");
-    var $L12 = $L("::");
-    var $L13 = $L("super[");
-    var $L14 = $L("import.meta");
-    var $L15 = $L(")");
-    var $L16 = $L("->");
-    var $L17 = $L("null");
-    var $L18 = $L("true");
-    var $L19 = $L("false");
-    var $L20 = $L("yes");
-    var $L21 = $L("on");
-    var $L22 = $L("no");
-    var $L23 = $L("off");
-    var $L24 = $L(",");
+    var $L0 = $L(",");
+    var $L1 = $L("");
+    var $L2 = $L("++");
+    var $L3 = $L("--");
+    var $L4 = $L("=>");
+    var $L5 = $L("<");
+    var $L6 = $L("extends");
+    var $L7 = $L("this");
+    var $L8 = $L("#");
+    var $L9 = $L(".");
+    var $L10 = $L("super");
+    var $L11 = $L("import");
+    var $L12 = $L("!");
+    var $L13 = $L("::");
+    var $L14 = $L("super[");
+    var $L15 = $L("import.meta");
+    var $L16 = $L(")");
+    var $L17 = $L("->");
+    var $L18 = $L("null");
+    var $L19 = $L("true");
+    var $L20 = $L("false");
+    var $L21 = $L("yes");
+    var $L22 = $L("on");
+    var $L23 = $L("no");
+    var $L24 = $L("off");
     var $L25 = $L("]");
     var $L26 = $L("}");
     var $L27 = $L("**=");
@@ -1098,11 +1100,7 @@ var require_parser = __commonJS({
         return Arguments$0(state) || Arguments$1(state);
       }
     }
-    var ArgumentsWithTrailingCallExpressions$0 = $TS($S(TrackIndent, $C($S(Arguments, $Q($S($Y(EOS), Samedent, $N(Backtick), CallExpressionRest)), PopIndent), PopIndent)), function($skip, $loc, $0, $1, $2) {
-      if (!$2)
-        return $skip;
-      return $2;
-    });
+    var ArgumentsWithTrailingCallExpressions$0 = $S(Arguments, $Q($S(Samedent, $N(Backtick), CallExpressionRest)));
     function ArgumentsWithTrailingCallExpressions(state) {
       if (state.verbose)
         console.log("ENTER:", "ArgumentsWithTrailingCallExpressions");
@@ -1112,9 +1110,7 @@ var require_parser = __commonJS({
         return ArgumentsWithTrailingCallExpressions$0(state);
       }
     }
-    var ArgumentList$0 = $T($S($Y(EOS), NestedArgumentList), function(value) {
-      return value[1];
-    });
+    var ArgumentList$0 = NestedArgumentList;
     var ArgumentList$1 = InlineArgumentExpressions;
     function ArgumentList(state) {
       if (state.tokenize) {
@@ -1148,7 +1144,7 @@ var require_parser = __commonJS({
         return NestedArgument$0(state);
       }
     }
-    var InlineArgumentExpressions$0 = $TS($S(ArgumentPart, $Q($S(__, Comma, $Q(TrailingComment), ArgumentPart))), function($skip, $loc, $0, $1, $2) {
+    var InlineArgumentExpressions$0 = $TS($S($Q(TrailingComment), ArgumentPart, $Q($S(__, Comma, $Q(TrailingComment), $C(NestedObjectLiteral, ArgumentList)))), function($skip, $loc, $0, $1, $2, $3) {
       if ($2.length == 0)
         return $1;
       return $0;
@@ -1177,28 +1173,28 @@ var require_parser = __commonJS({
       }
     }
     var ImplicitApplication$0 = $S(ApplicationStart, ArgumentList, InsertCloseParen);
+    var ImplicitApplication$1 = $S(IndentedApplicationAllowed, InsertOpenParen, NestedObjectLiteral, $Q($S(__, $EXPECT($L0, fail, 'ImplicitApplication ","'), NestedObjectLiteral)), InsertCloseParen);
     function ImplicitApplication(state) {
-      if (state.verbose)
-        console.log("ENTER:", "ImplicitApplication");
       if (state.tokenize) {
-        return $TOKEN("ImplicitApplication", state, ImplicitApplication$0(state));
+        return $TOKEN("ImplicitApplication", state, ImplicitApplication$0(state) || ImplicitApplication$1(state));
       } else {
-        return ImplicitApplication$0(state);
+        return ImplicitApplication$0(state) || ImplicitApplication$1(state);
       }
     }
     var ApplicationStart$0 = $TS($S($N(EOS), _, $N(AdditionalReservedWords)), function($skip, $loc, $0, $1, $2, $3) {
       var spacing = $2;
       return module2.insertTrimmingSpace(spacing, "(");
     });
-    var ApplicationStart$1 = $S(IndentedApplicationAllowed, $Y($S(EOS, NestedPropertyDefinitions)), InsertOpenParen);
     function ApplicationStart(state) {
+      if (state.verbose)
+        console.log("ENTER:", "ApplicationStart");
       if (state.tokenize) {
-        return $TOKEN("ApplicationStart", state, ApplicationStart$0(state) || ApplicationStart$1(state));
+        return $TOKEN("ApplicationStart", state, ApplicationStart$0(state));
       } else {
-        return ApplicationStart$0(state) || ApplicationStart$1(state);
+        return ApplicationStart$0(state);
       }
     }
-    var IndentedApplicationAllowed$0 = $TV($EXPECT($L0, fail, 'IndentedApplicationAllowed ""'), function($skip, $loc, $0, $1) {
+    var IndentedApplicationAllowed$0 = $TV($EXPECT($L1, fail, 'IndentedApplicationAllowed ""'), function($skip, $loc, $0, $1) {
       if (module2.suppressIndentedApplication)
         return $skip;
       return;
@@ -1323,7 +1319,7 @@ var require_parser = __commonJS({
         return UpdateExpression$0(state) || UpdateExpression$1(state);
       }
     }
-    var UpdateExpressionSymbol$0 = $TV($C($EXPECT($L1, fail, 'UpdateExpressionSymbol "++"'), $EXPECT($L2, fail, 'UpdateExpressionSymbol "--"')), function($skip, $loc, $0, $1) {
+    var UpdateExpressionSymbol$0 = $TV($C($EXPECT($L2, fail, 'UpdateExpressionSymbol "++"'), $EXPECT($L3, fail, 'UpdateExpressionSymbol "--"')), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function UpdateExpressionSymbol(state) {
@@ -1485,7 +1481,7 @@ var require_parser = __commonJS({
         return ArrowFunctionTail$0(state) || ArrowFunctionTail$1(state);
       }
     }
-    var FatArrow$0 = $TS($S(__, $EXPECT($L3, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
+    var FatArrow$0 = $TS($S(__, $EXPECT($L4, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       if (!ws.length)
         return " =>";
@@ -1500,14 +1496,8 @@ var require_parser = __commonJS({
         return FatArrow$0(state);
       }
     }
-    var FatArrowBody$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace), function(value) {
-      var exps = value[3];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
-    });
-    var FatArrowBody$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
-      var exps = value[2];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
-    });
+    var FatArrowBody$0 = ExplicitBlock;
+    var FatArrowBody$1 = ImplicitNestedBlock;
     var FatArrowBody$2 = AssignmentExpression;
     var FatArrowBody$3 = EmptyBlock;
     function FatArrowBody(state) {
@@ -1635,10 +1625,10 @@ var require_parser = __commonJS({
         return ClassHeritage$0(state);
       }
     }
-    var ExtendsToken$0 = $TV($EXPECT($L4, fail, 'ExtendsToken "<"'), function($skip, $loc, $0, $1) {
+    var ExtendsToken$0 = $TV($EXPECT($L5, fail, 'ExtendsToken "<"'), function($skip, $loc, $0, $1) {
       return { $loc, token: "extends" };
     });
-    var ExtendsToken$1 = $TV($EXPECT($L5, fail, 'ExtendsToken "extends"'), function($skip, $loc, $0, $1) {
+    var ExtendsToken$1 = $TV($EXPECT($L6, fail, 'ExtendsToken "extends"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function ExtendsToken(state) {
@@ -1648,8 +1638,8 @@ var require_parser = __commonJS({
         return ExtendsToken$0(state) || ExtendsToken$1(state);
       }
     }
-    var ClassBody$0 = $S(__, OpenBrace, $E($S(EOS, NestedClassElements)), __, CloseBrace);
-    var ClassBody$1 = $S(InsertOpenBrace, EOS, NestedClassElements, InsertNewline, InsertIndent, InsertCloseBrace);
+    var ClassBody$0 = $S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace);
+    var ClassBody$1 = $S(InsertOpenBrace, NestedClassElements, InsertNewline, InsertIndent, InsertCloseBrace);
     function ClassBody(state) {
       if (state.tokenize) {
         return $TOKEN("ClassBody", state, ClassBody$0(state) || ClassBody$1(state));
@@ -1720,10 +1710,10 @@ var require_parser = __commonJS({
         return FieldDefinition$0(state) || FieldDefinition$1(state) || FieldDefinition$2(state);
       }
     }
-    var This$0 = $TV($EXPECT($L6, fail, 'This "this"'), function($skip, $loc, $0, $1) {
+    var This$0 = $TV($EXPECT($L7, fail, 'This "this"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
-    var This$1 = $TS($S(At, $S($E($EXPECT($L7, fail, 'This "#"')), IdentifierName)), function($skip, $loc, $0, $1, $2) {
+    var This$1 = $TS($S(At, $S($E($EXPECT($L8, fail, 'This "#"')), IdentifierName)), function($skip, $loc, $0, $1, $2) {
       $1.token = "this.";
       return $0;
     });
@@ -1738,7 +1728,7 @@ var require_parser = __commonJS({
         return This$0(state) || This$1(state) || This$2(state);
       }
     }
-    var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($EXPECT($L8, fail, 'LeftHandSideExpression "."')), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
+    var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($EXPECT($L9, fail, 'LeftHandSideExpression "."')), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
       if ($1.length)
         return $0;
       return $2;
@@ -1752,8 +1742,8 @@ var require_parser = __commonJS({
         return LeftHandSideExpression$0(state);
       }
     }
-    var CallExpression$0 = $S($EXPECT($L9, fail, 'CallExpression "super"'), ArgumentsWithTrailingCallExpressions);
-    var CallExpression$1 = $S($EXPECT($L10, fail, 'CallExpression "import"'), __, OpenParen, ExtendedExpression, __, CloseParen);
+    var CallExpression$0 = $S($EXPECT($L10, fail, 'CallExpression "super"'), ArgumentsWithTrailingCallExpressions);
+    var CallExpression$1 = $S($EXPECT($L11, fail, 'CallExpression "import"'), __, OpenParen, ExtendedExpression, __, CloseParen);
     var CallExpression$2 = $TS($S(MemberExpression, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2) {
       if ($2.length)
         return $0;
@@ -1786,7 +1776,7 @@ var require_parser = __commonJS({
         return OptionalShorthand$0(state);
       }
     }
-    var NonNullAssertion$0 = $T($EXPECT($L11, fail, 'NonNullAssertion "!"'), function(value) {
+    var NonNullAssertion$0 = $T($EXPECT($L12, fail, 'NonNullAssertion "!"'), function(value) {
       return { "ts": true, "children": value };
     });
     function NonNullAssertion(state) {
@@ -1836,7 +1826,7 @@ var require_parser = __commonJS({
         $2.children.unshift($1[1]);
       return $2;
     });
-    var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L12, fail, 'MemberExpressionRest "::"'), $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+    var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L13, fail, 'MemberExpressionRest "::"'), $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
       var id = $3;
       if (id)
         return [".prototype.", id];
@@ -1910,7 +1900,7 @@ var require_parser = __commonJS({
         return PropertyAccess$0(state);
       }
     }
-    var SuperProperty$0 = $S($EXPECT($L13, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
+    var SuperProperty$0 = $S($EXPECT($L14, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
     function SuperProperty(state) {
       if (state.verbose)
         console.log("ENTER:", "SuperProperty");
@@ -1921,7 +1911,7 @@ var require_parser = __commonJS({
       }
     }
     var MetaProperty$0 = $S(New, Dot, Target);
-    var MetaProperty$1 = $TV($EXPECT($L14, fail, 'MetaProperty "import.meta"'), function($skip, $loc, $0, $1) {
+    var MetaProperty$1 = $TV($EXPECT($L15, fail, 'MetaProperty "import.meta"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function MetaProperty(state) {
@@ -1932,7 +1922,7 @@ var require_parser = __commonJS({
       }
     }
     var Parameters$0 = NonEmptyParameters;
-    var Parameters$1 = $TV($EXPECT($L0, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
+    var Parameters$1 = $TV($EXPECT($L1, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
       return {
         type: "Parameters",
         children: [{ $loc, token: "()" }],
@@ -1989,7 +1979,7 @@ var require_parser = __commonJS({
       }
     }
     var ParameterElementDelimiter$0 = $S($Q(_), Comma);
-    var ParameterElementDelimiter$1 = $Y($S(__, $EXPECT($L15, fail, 'ParameterElementDelimiter ")"')));
+    var ParameterElementDelimiter$1 = $Y($S(__, $EXPECT($L16, fail, 'ParameterElementDelimiter ")"')));
     var ParameterElementDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
       return { $loc, token: "," };
     });
@@ -2045,9 +2035,7 @@ var require_parser = __commonJS({
         return ObjectBindingPattern$0(state);
       }
     }
-    var ObjectBindingPatternContent$0 = $T($S($Y(EOS), NestedBindingProperties), function(value) {
-      return value[1];
-    });
+    var ObjectBindingPatternContent$0 = NestedBindingProperties;
     var ObjectBindingPatternContent$1 = $TS($S($Q(BindingProperty), $E($S(__, BindingRestProperty))), function($skip, $loc, $0, $1, $2) {
       var props = $1;
       var rest = $2;
@@ -2086,9 +2074,7 @@ var require_parser = __commonJS({
         return ArrayBindingPattern$0(state);
       }
     }
-    var ArrayBindingPatternContent$0 = $T($S($Y(EOS), NestedBindingElements), function(value) {
-      return value[1];
-    });
+    var ArrayBindingPatternContent$0 = NestedBindingElements;
     var ArrayBindingPatternContent$1 = $TS($S($Q($C(BindingElement, Elision)), $E($S(__, BindingRestElement))), function($skip, $loc, $0, $1, $2) {
       var props = $1;
       var rest = $2;
@@ -2391,7 +2377,7 @@ var require_parser = __commonJS({
         return ThinArrowFunction$0(state);
       }
     }
-    var Arrow$0 = $TV($EXPECT($L16, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
+    var Arrow$0 = $TV($EXPECT($L17, fail, 'Arrow "->"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Arrow(state) {
@@ -2403,16 +2389,52 @@ var require_parser = __commonJS({
         return Arrow$0(state);
       }
     }
-    var Block$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace), function(value) {
-      var exps = value[3];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
+    var ExplicitBlock$0 = $TS($S(__, OpenBrace, NestedBlockStatements, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var block = $3;
+      block.bare = false;
+      block.children.unshift($1, $2);
+      block.children.push($4, $5);
+      return block;
     });
-    var Block$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
-      var exps = value[2];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
+    function ExplicitBlock(state) {
+      if (state.verbose)
+        console.log("ENTER:", "ExplicitBlock");
+      if (state.tokenize) {
+        return $TOKEN("ExplicitBlock", state, ExplicitBlock$0(state));
+      } else {
+        return ExplicitBlock$0(state);
+      }
+    }
+    var ImplicitNestedBlock$0 = $TS($S(InsertOpenBrace, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var block = $2;
+      block.bare = false;
+      block.children.unshift($1);
+      block.children.push($3, $4, $5);
+      return block;
     });
+    function ImplicitNestedBlock(state) {
+      if (state.verbose)
+        console.log("ENTER:", "ImplicitNestedBlock");
+      if (state.tokenize) {
+        return $TOKEN("ImplicitNestedBlock", state, ImplicitNestedBlock$0(state));
+      } else {
+        return ImplicitNestedBlock$0(state);
+      }
+    }
+    var Block$0 = ExplicitBlock;
+    var Block$1 = ImplicitNestedBlock;
     var Block$2 = ThenClause;
-    var Block$3 = $S($Q(TrailingComment), Statement);
+    var Block$3 = $TS($S($Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      var s = $2;
+      const expressions = [$0];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: [expressions],
+        bare: true
+      };
+    });
     function Block(state) {
       if (state.tokenize) {
         return $TOKEN("Block", state, Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state));
@@ -2420,8 +2442,16 @@ var require_parser = __commonJS({
         return Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state);
       }
     }
-    var ThenClause$0 = $T($S(Then, $Q(TrailingComment), Statement), function(value) {
-      return [value[1], value[2]];
+    var ThenClause$0 = $TS($S(Then, $Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2, $3) {
+      var ws = $2;
+      var s = $3;
+      const expressions = [[ws, s]];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: [expressions],
+        bare: true
+      };
     });
     function ThenClause(state) {
       if (state.verbose)
@@ -2442,7 +2472,7 @@ var require_parser = __commonJS({
       }
     }
     var EmptyBlock$0 = $T($S(InsertOpenBrace, InsertCloseBrace), function(value) {
-      return { "type": "BlockStatement", "expressions": [], "children": value };
+      return { "type": "BlockStatement", "expressions": [], "children": value, "bare": false };
     });
     function EmptyBlock(state) {
       if (state.verbose)
@@ -2453,14 +2483,14 @@ var require_parser = __commonJS({
         return EmptyBlock$0(state);
       }
     }
-    var BracedBlock$0 = $T($S($Q(TrailingComment), OpenBrace, BracedContent, __, CloseBrace), function(value) {
-      var exps = value[2];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
-    });
-    var BracedBlock$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
-      var exps = value[2];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
+    var BracedBlock$0 = $TS($S($Q(TrailingComment), OpenBrace, BracedContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var block = $3;
+      block.bare = false;
+      block.children.unshift($1, $2);
+      block.children.push($4, $5);
+      return block;
     });
+    var BracedBlock$1 = ImplicitNestedBlock;
     var BracedBlock$2 = $TS($S(InsertOpenBrace, $Y(EOS), ObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
       var s = $3;
       $0.splice(1, 1);
@@ -2470,8 +2500,8 @@ var require_parser = __commonJS({
         children: $0
       };
     });
-    var BracedBlock$3 = $TS($S(InsertOpenBrace, $N(EOS), __, Statement, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      var s = $4;
+    var BracedBlock$3 = $TS($S(InsertOpenBrace, $N(EOS), $S(__, Statement), InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var s = $3;
       $0.splice(1, 1);
       return {
         type: "BlockStatement",
@@ -2486,10 +2516,16 @@ var require_parser = __commonJS({
         return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state) || BracedBlock$3(state);
       }
     }
-    var BracedContent$0 = $T($S($Y(EOS), NestedBlockStatements), function(value) {
-      return value[1];
+    var BracedContent$0 = NestedBlockStatements;
+    var BracedContent$1 = $TS($S($Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2) {
+      const expressions = [["", $2]];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: [$1, expressions],
+        bare: true
+      };
     });
-    var BracedContent$1 = $S($Q(TrailingComment), Statement);
     function BracedContent(state) {
       if (state.tokenize) {
         return $TOKEN("BracedContent", state, BracedContent$0(state) || BracedContent$1(state));
@@ -2501,7 +2537,16 @@ var require_parser = __commonJS({
       var statements = $2;
       if (!statements.length)
         return $skip;
-      return statements;
+      const first = statements[0];
+      const ws = first[0];
+      const indent = ws.pop();
+      first[0] = indent;
+      return {
+        type: "BlockStatement",
+        expressions: statements,
+        children: [ws, statements],
+        bare: true
+      };
     });
     function NestedBlockStatements(state) {
       if (state.verbose)
@@ -2549,7 +2594,7 @@ var require_parser = __commonJS({
         return LiteralContent$0(state) || LiteralContent$1(state) || LiteralContent$2(state) || LiteralContent$3(state);
       }
     }
-    var NullLiteral$0 = $TV($EXPECT($L17, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
+    var NullLiteral$0 = $TV($EXPECT($L18, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function NullLiteral(state) {
@@ -2564,7 +2609,7 @@ var require_parser = __commonJS({
     var BooleanLiteral$0 = $T($S(CoffeeBooleansEnabled, CoffeeScriptBooleanLiteral), function(value) {
       return value[1];
     });
-    var BooleanLiteral$1 = $TS($S($C($EXPECT($L18, fail, 'BooleanLiteral "true"'), $EXPECT($L19, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var BooleanLiteral$1 = $TS($S($C($EXPECT($L19, fail, 'BooleanLiteral "true"'), $EXPECT($L20, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function BooleanLiteral(state) {
@@ -2574,10 +2619,10 @@ var require_parser = __commonJS({
         return BooleanLiteral$0(state) || BooleanLiteral$1(state);
       }
     }
-    var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L20, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "true" };
     });
-    var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L23, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L23, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L24, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "false" };
     });
     function CoffeeScriptBooleanLiteral(state) {
@@ -2587,7 +2632,7 @@ var require_parser = __commonJS({
         return CoffeeScriptBooleanLiteral$0(state) || CoffeeScriptBooleanLiteral$1(state);
       }
     }
-    var Comma$0 = $TV($EXPECT($L24, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+    var Comma$0 = $TV($EXPECT($L0, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Comma(state) {
@@ -2885,9 +2930,7 @@ var require_parser = __commonJS({
         return BracedObjectLiteral$0(state);
       }
     }
-    var BracedObjectLiteralContent$0 = $T($S($Y(EOS), NestedPropertyDefinitions), function(value) {
-      return value[1];
-    });
+    var BracedObjectLiteralContent$0 = NestedPropertyDefinitions;
     var BracedObjectLiteralContent$1 = $TS($S(__, PropertyDefinitionList, $E($S(__, Comma))), function($skip, $loc, $0, $1, $2, $3) {
       if ($1.length) {
         $2.splice(0, 0, ...$1);
@@ -2904,12 +2947,12 @@ var require_parser = __commonJS({
         return BracedObjectLiteralContent$0(state) || BracedObjectLiteralContent$1(state);
       }
     }
-    var NestedObjectLiteral$0 = $TS($S(InsertOpenBrace, $Y(EOS), NestedPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      $3.unshift($1);
-      $3.push($4, $5, $6);
+    var NestedObjectLiteral$0 = $TS($S(InsertOpenBrace, NestedPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      $2.unshift($1);
+      $2.push($3, $4, $5);
       return {
         type: "ObjectExpression",
-        children: $3
+        children: $2
       };
     });
     function NestedObjectLiteral(state) {
@@ -3131,7 +3174,7 @@ var require_parser = __commonJS({
         return ClassElementName$0(state) || ClassElementName$1(state);
       }
     }
-    var PrivateIdentifier$0 = $TV($TEXT($S($EXPECT($L7, fail, 'PrivateIdentifier "#"'), IdentifierName)), function($skip, $loc, $0, $1) {
+    var PrivateIdentifier$0 = $TV($TEXT($S($EXPECT($L8, fail, 'PrivateIdentifier "#"'), IdentifierName)), function($skip, $loc, $0, $1) {
       return {
         type: "Identifier",
         name: $0,
@@ -3212,7 +3255,7 @@ var require_parser = __commonJS({
     var BinaryOpSymbol$6 = $EXPECT($L50, fail, 'BinaryOpSymbol "<="');
     var BinaryOpSymbol$7 = $EXPECT($L51, fail, 'BinaryOpSymbol ">="');
     var BinaryOpSymbol$8 = $EXPECT($L52, fail, 'BinaryOpSymbol "<<"');
-    var BinaryOpSymbol$9 = $EXPECT($L4, fail, 'BinaryOpSymbol "<"');
+    var BinaryOpSymbol$9 = $EXPECT($L5, fail, 'BinaryOpSymbol "<"');
     var BinaryOpSymbol$10 = $EXPECT($L53, fail, 'BinaryOpSymbol ">>>"');
     var BinaryOpSymbol$11 = $EXPECT($L54, fail, 'BinaryOpSymbol ">>"');
     var BinaryOpSymbol$12 = $EXPECT($L55, fail, 'BinaryOpSymbol ">"');
@@ -3356,9 +3399,8 @@ var require_parser = __commonJS({
         return EmptyStatement$0(state);
       }
     }
-    var BlockStatement$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace, $N($S(__, $EXPECT($L43, fail, 'BlockStatement "="')))), function(value) {
-      var exps = value[3];
-      return { "type": "BlockStatement", "children": value, "expressions": exps };
+    var BlockStatement$0 = $T($S(ExplicitBlock, $N($S(__, $EXPECT($L43, fail, 'BlockStatement "="')))), function(value) {
+      return value[0];
     });
     function BlockStatement(state) {
       if (state.verbose)
@@ -3460,8 +3502,8 @@ var require_parser = __commonJS({
         return UnlessExpression$0(state);
       }
     }
-    var ExpressionBlock$0 = $TS($S(InsertOpenParen, EOS, NestedBlockExpressions, InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      var exps = $3;
+    var ExpressionBlock$0 = $TS($S(InsertOpenParen, NestedBlockExpressions, InsertNewline, InsertIndent, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var exps = $2;
       exps[exps.length - 1].pop();
       return {
         type: "BlockExpressions",
@@ -3653,7 +3695,7 @@ var require_parser = __commonJS({
     });
     var ForStatementControl$1 = $TS($S(CoffeeForLoopsEnabled, CoffeeForStatementParameters, $E(WhenCondition)), function($skip, $loc, $0, $1, $2, $3) {
       if ($3) {
-        const indent = "".padStart((module2.currentIndent + 1) * 2);
+        const indent = module2.currentIndent.token + "  ";
         module2.insertTrimmingSpace($3, "");
         $2.blockPrefix.push([indent, {
           type: "IfStatement",
@@ -3691,7 +3733,7 @@ var require_parser = __commonJS({
       var step = $8;
       var close = $9;
       let blockPrefix = [];
-      const indent = "".padStart((module2.currentIndent + 1) * 2);
+      const indent = module2.currentIndent.token + "  ";
       if (kind.token === "from") {
         if (step) {
           throw new Error("Can't use 'by' with 'from' in CoffeeScript for loops");
@@ -3704,7 +3746,7 @@ var require_parser = __commonJS({
         module2.insertTrimmingSpace(declaration, "");
         module2.insertTrimmingSpace(exp, "");
         if (declaration.own) {
-          const indent2 = "".padStart((module2.currentIndent + 1) * 2);
+          const indent2 = module2.currentIndent.token + "  ";
           const hasPropRef = module2.getHasPropRef();
           blockPrefix.push([indent2, "if (!", hasPropRef, ".call(", exp, ", ", declaration, ")) continue\n"]);
         }
@@ -4018,18 +4060,16 @@ var require_parser = __commonJS({
         return SwitchExpression$0(state);
       }
     }
-    var CaseBlock$0 = $TS($S(__, OpenBrace, $Y(EOS), NestedCaseClauses, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      var clauses = $4;
-      $0.splice(2, 1);
+    var CaseBlock$0 = $TS($S(__, OpenBrace, NestedCaseClauses, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var clauses = $3;
       return {
         type: "CaseBlock",
         clauses,
         children: $0
       };
     });
-    var CaseBlock$1 = $TS($S($Y(EOS), InsertOpenBrace, NestedCaseClauses, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      var clauses = $3;
-      $0.shift();
+    var CaseBlock$1 = $TS($S(InsertOpenBrace, NestedCaseClauses, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var clauses = $2;
       return {
         type: "CaseBlock",
         clauses,
@@ -4076,21 +4116,37 @@ var require_parser = __commonJS({
       var expressions = value[2];
       return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
     });
-    var CaseClause$1 = $T($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function(value) {
-      var cases = value[1];
-      var expressions = value[2];
-      return { "type": "WhenClause", "cases": cases, "expressions": expressions, "children": value };
+    var CaseClause$1 = $TS($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var cases = $2;
+      var expressions = $3;
+      if (expressions.expressions) {
+        expressions = expressions.expressions;
+      }
+      return {
+        type: "WhenClause",
+        cases,
+        expressions,
+        children: $0
+      };
     });
-    var CaseClause$2 = $T($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function(value) {
-      var exps = value[2];
-      return { "type": "DefaultClause", "expressions": exps, "children": value };
+    var CaseClause$2 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function($skip, $loc, $0, $1, $2, $3) {
+      var expressions = $3;
+      if (expressions.expressions)
+        expressions = expressions.expressions;
+      return {
+        type: "DefaultClause",
+        expressions,
+        children: $0
+      };
     });
     var CaseClause$3 = $TS($S(Else, ImpliedColon, $C(NestedBlockStatements, $S($Q(TrailingComment), Statement))), function($skip, $loc, $0, $1, $2, $3) {
-      var exps = $3;
+      var expressions = $3;
       $1.token = "default";
+      if (expressions.expressions)
+        expressions = expressions.expressions;
       return {
         type: "DefaultClause",
-        expressions: exps,
+        expressions,
         children: $0
       };
     });
@@ -4120,7 +4176,7 @@ var require_parser = __commonJS({
         return CaseExpressionList$0(state);
       }
     }
-    var NoExpressions$0 = $T($EXPECT($L0, fail, 'NoExpressions ""'), function(value) {
+    var NoExpressions$0 = $T($EXPECT($L1, fail, 'NoExpressions ""'), function(value) {
       return [];
     });
     function NoExpressions(state) {
@@ -4133,7 +4189,7 @@ var require_parser = __commonJS({
       }
     }
     var ImpliedColon$0 = $S(__, Colon);
-    var ImpliedColon$1 = $TV($EXPECT($L0, fail, 'ImpliedColon ""'), function($skip, $loc, $0, $1) {
+    var ImpliedColon$1 = $TV($EXPECT($L1, fail, 'ImpliedColon ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ":" };
     });
     function ImpliedColon(state) {
@@ -4242,7 +4298,7 @@ var require_parser = __commonJS({
         return ExpressionWithIndentedApplicationSuppressed$0(state);
       }
     }
-    var SuppressIndentedApplication$0 = $TV($EXPECT($L0, fail, 'SuppressIndentedApplication ""'), function($skip, $loc, $0, $1) {
+    var SuppressIndentedApplication$0 = $TV($EXPECT($L1, fail, 'SuppressIndentedApplication ""'), function($skip, $loc, $0, $1) {
       module2.suppressIndentedApplication = true;
     });
     function SuppressIndentedApplication(state) {
@@ -4352,7 +4408,7 @@ var require_parser = __commonJS({
         return ImportDeclaration$0(state) || ImportDeclaration$1(state) || ImportDeclaration$2(state) || ImportDeclaration$3(state);
       }
     }
-    var ImpliedImport$0 = $TV($EXPECT($L0, fail, 'ImpliedImport ""'), function($skip, $loc, $0, $1) {
+    var ImpliedImport$0 = $TV($EXPECT($L1, fail, 'ImpliedImport ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "import " };
     });
     function ImpliedImport(state) {
@@ -5210,7 +5266,7 @@ var require_parser = __commonJS({
         return NonIdContinue$0(state);
       }
     }
-    var Loc$0 = $TV($EXPECT($L0, fail, 'Loc ""'), function($skip, $loc, $0, $1) {
+    var Loc$0 = $TV($EXPECT($L1, fail, 'Loc ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "" };
     });
     function Loc(state) {
@@ -5366,7 +5422,7 @@ var require_parser = __commonJS({
         return CloseBracket$0(state);
       }
     }
-    var CloseParen$0 = $TV($EXPECT($L15, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
+    var CloseParen$0 = $TV($EXPECT($L16, fail, 'CloseParen ")"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseParen(state) {
@@ -5450,7 +5506,7 @@ var require_parser = __commonJS({
         return Do$0(state);
       }
     }
-    var Dot$0 = $TV($EXPECT($L8, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
+    var Dot$0 = $TV($EXPECT($L9, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Dot(state) {
@@ -5594,7 +5650,7 @@ var require_parser = __commonJS({
         return If$0(state);
       }
     }
-    var Import$0 = $TS($S($EXPECT($L10, fail, 'Import "import"'), $Y($EXPECT($R36, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+    var Import$0 = $TS($S($EXPECT($L11, fail, 'Import "import"'), $Y($EXPECT($R36, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Import(state) {
@@ -6005,7 +6061,7 @@ var require_parser = __commonJS({
         return JSXElement$0(state) || JSXElement$1(state);
       }
     }
-    var JSXSelfClosingElement$0 = $S($EXPECT($L4, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L140, fail, 'JSXSelfClosingElement "/>"'));
+    var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L140, fail, 'JSXSelfClosingElement "/>"'));
     function JSXSelfClosingElement(state) {
       if (state.verbose)
         console.log("ENTER:", "JSXSelfClosingElement");
@@ -6015,7 +6071,7 @@ var require_parser = __commonJS({
         return JSXSelfClosingElement$0(state);
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L4, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L55, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L55, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       if (state.verbose)
         console.log("ENTER:", "JSXOpeningElement");
@@ -6219,9 +6275,9 @@ var require_parser = __commonJS({
         return Namespace$0(state);
       }
     }
-    var InterfaceBlock$0 = $S(__, OpenBrace, EOS, NestedInterfaceProperties, __, CloseBrace);
+    var InterfaceBlock$0 = $S(__, OpenBrace, NestedInterfaceProperties, __, CloseBrace);
     var InterfaceBlock$1 = $S(__, OpenBrace, $Q($S(__, InterfaceProperty)), __, CloseBrace);
-    var InterfaceBlock$2 = $S(InsertOpenBrace, EOS, NestedInterfaceProperties, InsertNewline, InsertIndent, InsertCloseBrace);
+    var InterfaceBlock$2 = $S(InsertOpenBrace, NestedInterfaceProperties, InsertNewline, InsertIndent, InsertCloseBrace);
     function InterfaceBlock(state) {
       if (state.tokenize) {
         return $TOKEN("InterfaceBlock", state, InterfaceBlock$0(state) || InterfaceBlock$1(state) || InterfaceBlock$2(state));
@@ -6274,9 +6330,9 @@ var require_parser = __commonJS({
         return InterfacePropertyDelimiter$0(state) || InterfacePropertyDelimiter$1(state) || InterfacePropertyDelimiter$2(state);
       }
     }
-    var NamespaceBlock$0 = $S(__, OpenBrace, EOS, NestedTypeDeclarations, __, CloseBrace);
+    var NamespaceBlock$0 = $S(__, OpenBrace, NestedTypeDeclarations, __, CloseBrace);
     var NamespaceBlock$1 = $S(__, OpenBrace, $Q($S(__, TypeDeclaration, InterfacePropertyDelimiter)), __, CloseBrace);
-    var NamespaceBlock$2 = $S(InsertOpenBrace, EOS, NestedTypeDeclarations, InsertNewline, InsertIndent, InsertCloseBrace);
+    var NamespaceBlock$2 = $S(InsertOpenBrace, NestedTypeDeclarations, InsertNewline, InsertIndent, InsertCloseBrace);
     function NamespaceBlock(state) {
       if (state.tokenize) {
         return $TOKEN("NamespaceBlock", state, NamespaceBlock$0(state) || NamespaceBlock$1(state) || NamespaceBlock$2(state));
@@ -6500,7 +6556,7 @@ var require_parser = __commonJS({
         return NestedType$0(state);
       }
     }
-    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L5, fail, 'TypeConditional "extends"'), Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
+    var TypeConditional$0 = $TS($S(TypeBinary, $E($S(__, $EXPECT($L6, fail, 'TypeConditional "extends"'), Type, $E($S(__, QuestionMark, Type, __, Colon, Type))))), function($skip, $loc, $0, $1, $2) {
       if ($2)
         return $0;
       return $1;
@@ -6541,7 +6597,7 @@ var require_parser = __commonJS({
         return TypeBinaryOp$0(state) || TypeBinaryOp$1(state);
       }
     }
-    var FunctionType$0 = $S(Parameters, __, $EXPECT($L3, fail, 'FunctionType "=>"'), Type);
+    var FunctionType$0 = $S(Parameters, __, $EXPECT($L4, fail, 'FunctionType "=>"'), Type);
     function FunctionType(state) {
       if (state.verbose)
         console.log("ENTER:", "FunctionType");
@@ -6551,7 +6607,7 @@ var require_parser = __commonJS({
         return FunctionType$0(state);
       }
     }
-    var TypeArguments$0 = $S(__, $EXPECT($L4, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L55, fail, 'TypeArguments ">"'));
+    var TypeArguments$0 = $S(__, $EXPECT($L5, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L55, fail, 'TypeArguments ">"'));
     function TypeArguments(state) {
       if (state.verbose)
         console.log("ENTER:", "TypeArguments");
@@ -6561,7 +6617,7 @@ var require_parser = __commonJS({
         return TypeArguments$0(state);
       }
     }
-    var TypeParameters$0 = $TS($S(__, $EXPECT($L4, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L55, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L55, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       return { ts: true, children: $0 };
     });
     function TypeParameters(state) {
@@ -6583,7 +6639,7 @@ var require_parser = __commonJS({
         return TypeParameter$0(state);
       }
     }
-    var TypeConstraint$0 = $S(__, $EXPECT($L5, fail, 'TypeConstraint "extends"'), Type);
+    var TypeConstraint$0 = $S(__, $EXPECT($L6, fail, 'TypeConstraint "extends"'), Type);
     function TypeConstraint(state) {
       if (state.verbose)
         console.log("ENTER:", "TypeConstraint");
@@ -6709,7 +6765,7 @@ var require_parser = __commonJS({
         return EOL$0(state);
       }
     }
-    var Debugger$0 = $TV($EXPECT($L0, fail, 'Debugger ""'), function($skip, $loc, $0, $1) {
+    var Debugger$0 = $TV($EXPECT($L1, fail, 'Debugger ""'), function($skip, $loc, $0, $1) {
       debugger;
     });
     function Debugger(state) {
@@ -6721,7 +6777,7 @@ var require_parser = __commonJS({
         return Debugger$0(state);
       }
     }
-    var InsertOpenParen$0 = $TV($EXPECT($L0, fail, 'InsertOpenParen ""'), function($skip, $loc, $0, $1) {
+    var InsertOpenParen$0 = $TV($EXPECT($L1, fail, 'InsertOpenParen ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "(" };
     });
     function InsertOpenParen(state) {
@@ -6733,7 +6789,7 @@ var require_parser = __commonJS({
         return InsertOpenParen$0(state);
       }
     }
-    var InsertCloseParen$0 = $TV($EXPECT($L0, fail, 'InsertCloseParen ""'), function($skip, $loc, $0, $1) {
+    var InsertCloseParen$0 = $TV($EXPECT($L1, fail, 'InsertCloseParen ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ")" };
     });
     function InsertCloseParen(state) {
@@ -6745,7 +6801,7 @@ var require_parser = __commonJS({
         return InsertCloseParen$0(state);
       }
     }
-    var InsertOpenBrace$0 = $TV($EXPECT($L0, fail, 'InsertOpenBrace ""'), function($skip, $loc, $0, $1) {
+    var InsertOpenBrace$0 = $TV($EXPECT($L1, fail, 'InsertOpenBrace ""'), function($skip, $loc, $0, $1) {
       return [{ $loc, token: " " }, { $loc, token: "{" }];
     });
     function InsertOpenBrace(state) {
@@ -6757,7 +6813,7 @@ var require_parser = __commonJS({
         return InsertOpenBrace$0(state);
       }
     }
-    var InsertCloseBrace$0 = $TV($EXPECT($L0, fail, 'InsertCloseBrace ""'), function($skip, $loc, $0, $1) {
+    var InsertCloseBrace$0 = $TV($EXPECT($L1, fail, 'InsertCloseBrace ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "}" };
     });
     function InsertCloseBrace(state) {
@@ -6769,7 +6825,7 @@ var require_parser = __commonJS({
         return InsertCloseBrace$0(state);
       }
     }
-    var InsertConst$0 = $TV($EXPECT($L0, fail, 'InsertConst ""'), function($skip, $loc, $0, $1) {
+    var InsertConst$0 = $TV($EXPECT($L1, fail, 'InsertConst ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "const " };
     });
     function InsertConst(state) {
@@ -6781,7 +6837,7 @@ var require_parser = __commonJS({
         return InsertConst$0(state);
       }
     }
-    var InsertReadonly$0 = $TV($EXPECT($L0, fail, 'InsertReadonly ""'), function($skip, $loc, $0, $1) {
+    var InsertReadonly$0 = $TV($EXPECT($L1, fail, 'InsertReadonly ""'), function($skip, $loc, $0, $1) {
       return { ts: true, children: [{ $loc, token: "readonly " }] };
     });
     function InsertReadonly(state) {
@@ -6793,7 +6849,7 @@ var require_parser = __commonJS({
         return InsertReadonly$0(state);
       }
     }
-    var InsertNewline$0 = $TV($EXPECT($L0, fail, 'InsertNewline ""'), function($skip, $loc, $0, $1) {
+    var InsertNewline$0 = $TV($EXPECT($L1, fail, 'InsertNewline ""'), function($skip, $loc, $0, $1) {
       return "\n";
     });
     function InsertNewline(state) {
@@ -6805,8 +6861,8 @@ var require_parser = __commonJS({
         return InsertNewline$0(state);
       }
     }
-    var InsertIndent$0 = $TV($EXPECT($L0, fail, 'InsertIndent ""'), function($skip, $loc, $0, $1) {
-      return "".padStart(module2.currentIndent * 2);
+    var InsertIndent$0 = $TV($EXPECT($L1, fail, 'InsertIndent ""'), function($skip, $loc, $0, $1) {
+      return module2.currentIndent.token;
     });
     function InsertIndent(state) {
       if (state.verbose)
@@ -6817,7 +6873,7 @@ var require_parser = __commonJS({
         return InsertIndent$0(state);
       }
     }
-    var InsertSpace$0 = $TV($EXPECT($L0, fail, 'InsertSpace ""'), function($skip, $loc, $0, $1) {
+    var InsertSpace$0 = $TV($EXPECT($L1, fail, 'InsertSpace ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: " " };
     });
     function InsertSpace(state) {
@@ -6829,7 +6885,7 @@ var require_parser = __commonJS({
         return InsertSpace$0(state);
       }
     }
-    var InsertDot$0 = $TV($EXPECT($L0, fail, 'InsertDot ""'), function($skip, $loc, $0, $1) {
+    var InsertDot$0 = $TV($EXPECT($L1, fail, 'InsertDot ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: "." };
     });
     function InsertDot(state) {
@@ -6841,7 +6897,7 @@ var require_parser = __commonJS({
         return InsertDot$0(state);
       }
     }
-    var InsertBreak$0 = $TV($EXPECT($L0, fail, 'InsertBreak ""'), function($skip, $loc, $0, $1) {
+    var InsertBreak$0 = $TV($EXPECT($L1, fail, 'InsertBreak ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ";break;" };
     });
     function InsertBreak(state) {
@@ -6853,7 +6909,7 @@ var require_parser = __commonJS({
         return InsertBreak$0(state);
       }
     }
-    var CoffeeBinaryExistentialEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeBinaryExistentialEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeBinaryExistentialEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeBinaryExistentialEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeBinaryExistential)
         return;
       return $skip;
@@ -6867,7 +6923,7 @@ var require_parser = __commonJS({
         return CoffeeBinaryExistentialEnabled$0(state);
       }
     }
-    var CoffeeBooleansEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeBooleansEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeBooleansEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeBooleansEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeBooleans)
         return;
       return $skip;
@@ -6881,7 +6937,7 @@ var require_parser = __commonJS({
         return CoffeeBooleansEnabled$0(state);
       }
     }
-    var CoffeeClassesEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeClassesEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeClassesEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeClassesEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeClasses)
         return;
       return $skip;
@@ -6895,7 +6951,7 @@ var require_parser = __commonJS({
         return CoffeeClassesEnabled$0(state);
       }
     }
-    var CoffeeCommentEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeCommentEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeCommentEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeCommentEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeComment)
         return;
       return $skip;
@@ -6909,7 +6965,7 @@ var require_parser = __commonJS({
         return CoffeeCommentEnabled$0(state);
       }
     }
-    var CoffeeDoEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeDoEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeDoEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeDoEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeDo)
         return;
       return $skip;
@@ -6923,7 +6979,7 @@ var require_parser = __commonJS({
         return CoffeeDoEnabled$0(state);
       }
     }
-    var CoffeeForLoopsEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeForLoopsEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeForLoopsEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeForLoopsEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeForLoops)
         return;
       return $skip;
@@ -6937,7 +6993,7 @@ var require_parser = __commonJS({
         return CoffeeForLoopsEnabled$0(state);
       }
     }
-    var CoffeeInterpolationEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeInterpolationEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeInterpolationEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeInterpolationEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeInterpolation)
         return;
       return $skip;
@@ -6951,7 +7007,7 @@ var require_parser = __commonJS({
         return CoffeeInterpolationEnabled$0(state);
       }
     }
-    var CoffeeIsntEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeIsntEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeIsntEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeIsntEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeIsnt)
         return;
       return $skip;
@@ -6965,7 +7021,7 @@ var require_parser = __commonJS({
         return CoffeeIsntEnabled$0(state);
       }
     }
-    var CoffeeLineContinuationEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeLineContinuationEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeLineContinuationEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeLineContinuationEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeLineContinuation)
         return;
       return $skip;
@@ -6979,7 +7035,7 @@ var require_parser = __commonJS({
         return CoffeeLineContinuationEnabled$0(state);
       }
     }
-    var CoffeeNotEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeNotEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeNotEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeNotEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeNot)
         return;
       return $skip;
@@ -6993,7 +7049,7 @@ var require_parser = __commonJS({
         return CoffeeNotEnabled$0(state);
       }
     }
-    var CoffeeOfEnabled$0 = $TV($EXPECT($L0, fail, 'CoffeeOfEnabled ""'), function($skip, $loc, $0, $1) {
+    var CoffeeOfEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeOfEnabled ""'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeOf)
         return;
       return $skip;
@@ -7007,9 +7063,21 @@ var require_parser = __commonJS({
         return CoffeeOfEnabled$0(state);
       }
     }
-    var Reset$0 = $TV($EXPECT($L0, fail, 'Reset ""'), function($skip, $loc, $0, $1) {
-      module2.currentIndent = 0;
-      module2.indentLevels = [0];
+    var Reset$0 = $TV($EXPECT($L1, fail, 'Reset ""'), function($skip, $loc, $0, $1) {
+      module2.indentLevels = [{
+        level: 0,
+        token: ""
+      }];
+      if (!module2._init) {
+        module2._init = true;
+        Object.defineProperties(module2, {
+          currentIndent: {
+            get() {
+              return module2.indentLevels[module2.indentLevels.length - 1];
+            }
+          }
+        });
+      }
       module2.verbose = false;
       module2.config = {
         autoVar: false,
@@ -7044,7 +7112,7 @@ var require_parser = __commonJS({
           ts: true,
           children: [" as any"]
         };
-        module2.prelude.push(["", "const ", indexOfRef, typeSuffix, " = [].indexOf", asAny, "\n"]);
+        module2.prelude.push(["", ["const ", indexOfRef, typeSuffix, " = [].indexOf", asAny, "\n"]]);
         return indexOfRef;
       };
       module2.getHasPropRef = function() {
@@ -7062,7 +7130,7 @@ var require_parser = __commonJS({
           ts: true,
           children: [" as any"]
         };
-        module2.prelude.push(["", "const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", asAny, "\n"]);
+        module2.prelude.push(["", ["const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", asAny, "\n"]]);
         return hasPropRef;
       };
       Object.defineProperty(module2.config, "coffeeCompat", {
@@ -7111,7 +7179,7 @@ var require_parser = __commonJS({
         return Reset$0(state);
       }
     }
-    var Init$0 = $TS($S($E(Shebang), $Q(DirectivePrologue), $EXPECT($L0, fail, 'Init ""')), function($skip, $loc, $0, $1, $2, $3) {
+    var Init$0 = $TS($S($E(Shebang), $Q(DirectivePrologue), $EXPECT($L1, fail, 'Init ""')), function($skip, $loc, $0, $1, $2, $3) {
       var directives = $2;
       directives.forEach((directive) => {
         if (directive.type === "CivetPrologue") {
@@ -7621,7 +7689,9 @@ var require_parser = __commonJS({
           scopes.pop();
         });
         if (varIds.length) {
-          const indent = statements[0][0];
+          let indent = statements[0][0];
+          if (Array.isArray(indent))
+            indent = indent[indent.length - 1];
           statements.unshift([indent, "var ", varIds.join(", "), "\n"]);
         }
       }
@@ -7640,7 +7710,7 @@ var require_parser = __commonJS({
       const level = $1.length;
       return {
         $loc,
-        token: "".padStart(level * 2),
+        token: $1.join(""),
         level
       };
     });
@@ -7653,23 +7723,28 @@ var require_parser = __commonJS({
         return Indent$0(state);
       }
     }
-    var TrackIndent$0 = $TV($EXPECT($L0, fail, 'TrackIndent ""'), function($skip, $loc, $0, $1) {
-      module2.indentLevels.push(module2.currentIndent);
+    var TrackIndented$0 = $TV(Indent, function($skip, $loc, $0, $1) {
+      var indent = $0;
+      const { level } = indent;
+      if (level <= module2.currentIndent.level) {
+        return $skip;
+      }
+      module2.indentLevels.push(indent);
     });
-    function TrackIndent(state) {
+    function TrackIndented(state) {
       if (state.verbose)
-        console.log("ENTER:", "TrackIndent");
+        console.log("ENTER:", "TrackIndented");
       if (state.tokenize) {
-        return $TOKEN("TrackIndent", state, TrackIndent$0(state));
+        return $TOKEN("TrackIndented", state, TrackIndented$0(state));
       } else {
-        return TrackIndent$0(state);
+        return TrackIndented$0(state);
       }
     }
-    var Samedent$0 = $TS($S($E(EOS), Indent), function($skip, $loc, $0, $1, $2) {
+    var Samedent$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
       var indent = $2;
       const { level } = indent;
-      const currentIndent = module2.indentLevels[module2.indentLevels.length - 1];
-      if (level === currentIndent) {
+      const currentIndentLevel = module2.currentIndent.level;
+      if (level === currentIndentLevel) {
         return $0;
       }
       return $skip;
@@ -7683,11 +7758,11 @@ var require_parser = __commonJS({
         return Samedent$0(state);
       }
     }
-    var IndentedFurther$0 = $TS($S($E(EOS), Indent), function($skip, $loc, $0, $1, $2) {
+    var IndentedFurther$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
       var indent = $2;
       const { level } = indent;
-      const currentIndent = module2.indentLevels[module2.indentLevels.length - 1];
-      if (level > currentIndent) {
+      const currentIndentLevel = module2.currentIndent.level;
+      if (level > currentIndentLevel) {
         return $0;
       }
       return $skip;
@@ -7701,13 +7776,7 @@ var require_parser = __commonJS({
         return IndentedFurther$0(state);
       }
     }
-    var PushIndent$0 = $TV($EXPECT($L0, fail, 'PushIndent ""'), function($skip, $loc, $0, $1) {
-      module2.currentIndent++;
-      if (module2.verbose) {
-        console.log("pushing indent", module2.currentIndent);
-      }
-      module2.indentLevels.push(module2.currentIndent);
-    });
+    var PushIndent$0 = $Y($S(EOS, TrackIndented));
     function PushIndent(state) {
       if (state.verbose)
         console.log("ENTER:", "PushIndent");
@@ -7717,12 +7786,11 @@ var require_parser = __commonJS({
         return PushIndent$0(state);
       }
     }
-    var PopIndent$0 = $TV($EXPECT($L0, fail, 'PopIndent ""'), function($skip, $loc, $0, $1) {
+    var PopIndent$0 = $TV($EXPECT($L1, fail, 'PopIndent ""'), function($skip, $loc, $0, $1) {
       if (module2.verbose) {
         console.log("popping indent", module2.indentLevels[module2.indentLevels.length - 1], "->", module2.indentLevels[module2.indentLevels.length - 2]);
       }
       module2.indentLevels.pop();
-      module2.currentIndent = module2.indentLevels[module2.indentLevels.length - 1];
     });
     function PopIndent(state) {
       if (state.verbose)
@@ -7733,16 +7801,15 @@ var require_parser = __commonJS({
         return PopIndent$0(state);
       }
     }
-    var Nested$0 = $TS($S($E(EOS), Indent), function($skip, $loc, $0, $1, $2) {
+    var Nested$0 = $TS($S(EOS, Indent), function($skip, $loc, $0, $1, $2) {
       var eos = $1;
       var indent = $2;
       const { level } = indent;
-      const currentIndent = module2.indentLevels[module2.indentLevels.length - 1];
+      const currentIndent = module2.currentIndent;
       if (module2.verbose) {
-        console.log("global indent", module2.currentIndent);
         console.log("Indented", level, currentIndent);
       }
-      if (level !== currentIndent) {
+      if (level !== currentIndent.level) {
         if (module2.verbose) {
           console.log("skipped nested");
         }