@danielx/civet 0.4.14 → 0.4.16

package/dist/browser.js

@@ -452,6 +452,7 @@ var Civet = (() => {
         AdditionalReservedWords,
         MemberExpression,
         MemberExpressionRest,
+        MemberBracketContent,
         PropertyAccess,
         SuperProperty,
         MetaProperty,
@@ -642,6 +643,7 @@ var Civet = (() => {
         Delete,
         Do,
         Dot,
+        DotDot,
         DotDotDot,
         DoubleQuote,
         Else,
@@ -865,60 +867,61 @@ var Civet = (() => {
       var $L91 = $L("delete");
       var $L92 = $L("do");
       var $L93 = $L(".");
-      var $L94 = $L("...");
-      var $L95 = $L('"');
-      var $L96 = $L("else");
-      var $L97 = $L("export");
-      var $L98 = $L("for");
-      var $L99 = $L("from");
-      var $L100 = $L("function");
-      var $L101 = $L("get");
-      var $L102 = $L("set");
-      var $L103 = $L("if");
-      var $L104 = $L("let");
-      var $L105 = $L("const");
-      var $L106 = $L("loop");
-      var $L107 = $L("new");
-      var $L108 = $L("of");
-      var $L109 = $L("{");
-      var $L110 = $L("[");
-      var $L111 = $L("(");
-      var $L112 = $L("?");
-      var $L113 = $L("return");
-      var $L114 = $L("'");
-      var $L115 = $L("static");
-      var $L116 = $L("${");
-      var $L117 = $L("switch");
-      var $L118 = $L("target");
-      var $L119 = $L("throw");
-      var $L120 = $L('"""');
-      var $L121 = $L("'''");
-      var $L122 = $L("```");
-      var $L123 = $L("try");
-      var $L124 = $L("typeof");
-      var $L125 = $L("unless");
-      var $L126 = $L("until");
-      var $L127 = $L("var");
-      var $L128 = $L("void");
-      var $L129 = $L("when");
-      var $L130 = $L("while");
-      var $L131 = $L("yield");
-      var $L132 = $L("/>");
-      var $L133 = $L("</");
-      var $L134 = $L("<>");
-      var $L135 = $L("</>");
-      var $L136 = $L("declare");
-      var $L137 = $L("type");
-      var $L138 = $L("interface");
-      var $L139 = $L("namespace");
-      var $L140 = $L("readonly");
-      var $L141 = $L("asserts");
-      var $L142 = $L("keyof");
-      var $L143 = $L("infer");
-      var $L144 = $L("[]");
-      var $L145 = $L("civet");
-      var $L146 = $L("  ");
-      var $L147 = $L("	");
+      var $L94 = $L("..");
+      var $L95 = $L("...");
+      var $L96 = $L('"');
+      var $L97 = $L("else");
+      var $L98 = $L("export");
+      var $L99 = $L("for");
+      var $L100 = $L("from");
+      var $L101 = $L("function");
+      var $L102 = $L("get");
+      var $L103 = $L("set");
+      var $L104 = $L("if");
+      var $L105 = $L("let");
+      var $L106 = $L("const");
+      var $L107 = $L("loop");
+      var $L108 = $L("new");
+      var $L109 = $L("of");
+      var $L110 = $L("{");
+      var $L111 = $L("[");
+      var $L112 = $L("(");
+      var $L113 = $L("?");
+      var $L114 = $L("return");
+      var $L115 = $L("'");
+      var $L116 = $L("static");
+      var $L117 = $L("${");
+      var $L118 = $L("switch");
+      var $L119 = $L("target");
+      var $L120 = $L("throw");
+      var $L121 = $L('"""');
+      var $L122 = $L("'''");
+      var $L123 = $L("```");
+      var $L124 = $L("try");
+      var $L125 = $L("typeof");
+      var $L126 = $L("unless");
+      var $L127 = $L("until");
+      var $L128 = $L("var");
+      var $L129 = $L("void");
+      var $L130 = $L("when");
+      var $L131 = $L("while");
+      var $L132 = $L("yield");
+      var $L133 = $L("/>");
+      var $L134 = $L("</");
+      var $L135 = $L("<>");
+      var $L136 = $L("</>");
+      var $L137 = $L("declare");
+      var $L138 = $L("type");
+      var $L139 = $L("interface");
+      var $L140 = $L("namespace");
+      var $L141 = $L("readonly");
+      var $L142 = $L("asserts");
+      var $L143 = $L("keyof");
+      var $L144 = $L("infer");
+      var $L145 = $L("[]");
+      var $L146 = $L("civet");
+      var $L147 = $L("  ");
+      var $L148 = $L("	");
       var $R0 = $R(new RegExp("(of)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
       var $R1 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
       var $R2 = $R(new RegExp("[!~+-]", "suy"));
@@ -926,8 +929,8 @@ var Civet = (() => {
       var $R4 = $R(new RegExp('[^;"\\s]+', "suy"));
       var $R5 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
       var $R6 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
-      var $R7 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*)?)?", "suy"));
-      var $R8 = $R(new RegExp("(?:\\.(?!\\p{ID_Start})[0-9](?:_[0-9]|[0-9])*)", "suy"));
+      var $R7 = $R(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*))?", "suy"));
+      var $R8 = $R(new RegExp("(?:\\.[0-9](?:_[0-9]|[0-9])*)", "suy"));
       var $R9 = $R(new RegExp("(?:[eE][+-]?[0-9]+(?:_[0-9]|[0-9])*)", "suy"));
       var $R10 = $R(new RegExp("0[bB][01](?:[01]|_[01])*n?", "suy"));
       var $R11 = $R(new RegExp("0[oO][0-7](?:[0-7]|_[0-7])*n?", "suy"));
@@ -1198,8 +1201,37 @@ var Civet = (() => {
       var AssignmentExpressionRest$0 = AwaitExpression;
       var AssignmentExpressionRest$1 = YieldExpression;
       var AssignmentExpressionRest$2 = $S($E($S(Async, __)), ArrowFunction);
-      var AssignmentExpressionRest$3 = $T($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression), function(value) {
-        return { "type": "AssignmentExpression", "children": value };
+      var AssignmentExpressionRest$3 = $TS($S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression), function($skip, $loc, $0, $1, $2) {
+        const lastAssignment = $1[$1.length - 1];
+        if (lastAssignment[3].token === "=") {
+          const lhs = lastAssignment[1];
+          if (Array.isArray(lhs) && lhs.length > 1) {
+            const props = lhs[lhs.length - 1];
+            if (Array.isArray(props)) {
+              const lastProp = props[props.length - 1];
+              if (lastProp.type === "SliceExpression") {
+                const { start, end, children: c } = lastProp;
+                c[0].token = ".splice(";
+                c[1] = start;
+                c[2] = ", ";
+                if (end)
+                  c[3] = [end, " - ", start];
+                else
+                  c[3] = ["1/0"];
+                c[4] = [", ...", $2];
+                c[5] = ")";
+                lastAssignment.pop();
+                if (module.isWhitespaceOrEmpty(lastAssignment[2]))
+                  lastAssignment.pop();
+                return $1;
+              }
+            }
+          }
+        }
+        return {
+          type: "AssignmentExpression",
+          children: $0
+        };
       });
       var AssignmentExpressionRest$4 = ConditionalExpression;
       function AssignmentExpressionRest(state) {
@@ -1544,7 +1576,11 @@ var Civet = (() => {
           return MemberExpression$0(state) || MemberExpression$1(state) || MemberExpression$2(state);
         }
       }
-      var MemberExpressionRest$0 = $S($E($C(OptionalShorthand, NonNullAssertion)), OpenBracket, Expression, __, CloseBracket);
+      var MemberExpressionRest$0 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), MemberBracketContent), function($skip, $loc, $0, $1, $2) {
+        if ($1)
+          return $0;
+        return $2;
+      });
       var MemberExpressionRest$1 = $S($E($S($Y(EOS), IndentedFurther)), PropertyAccess);
       var MemberExpressionRest$2 = $TS($S($E($S($Y(EOS), IndentedFurther)), $EXPECT($L12, fail, 'MemberExpressionRest "::"'), $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
         var id = $3;
@@ -1560,6 +1596,48 @@ var Civet = (() => {
           return MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state);
         }
       }
+      var MemberBracketContent$0 = $TS($S(OpenBracket, Expression, $E($S($C(DotDotDot, DotDot), $E(Expression))), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        if ($3) {
+          const sep = $3[0];
+          const end = $3[1];
+          const inclusive = sep.token === "..";
+          sep.token = ", ";
+          $1.token = ".slice(";
+          $5.token = ")";
+          if (!end) {
+            return {
+              type: "SliceExpression",
+              start: $2,
+              end: void 0,
+              children: [$1, $2, $4, $5]
+            };
+          }
+          if (inclusive) {
+            return {
+              type: "SliceExpression",
+              start: $2,
+              end: ["1 + ", end],
+              children: [$1, $2, sep, ["1 + ", end, " || 1/0"], $4, $5]
+            };
+          }
+          return {
+            type: "SliceExpression",
+            start: $2,
+            end,
+            children: [$1, $2, sep, end, $4, $5]
+          };
+        }
+        return $0;
+      });
+      function MemberBracketContent(state) {
+        if (state.verbose)
+          console.log("ENTER:", "MemberBracketContent");
+        if (state.tokenize) {
+          return $TOKEN("MemberBracketContent", state, MemberBracketContent$0(state));
+        } else {
+          return MemberBracketContent$0(state);
+        }
+      }
       var PropertyAccess$0 = $S($E($C(QuestionMark, NonNullAssertion)), Dot, $C(IdentifierName, PrivateIdentifier));
       function PropertyAccess(state) {
         if (state.verbose)
@@ -3331,8 +3409,8 @@ var Civet = (() => {
       var DecimalLiteral$0 = $TV($TEXT($EXPECT($R6, fail, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))/")), function($skip, $loc, $0, $1) {
         return $1 + ".";
       });
-      var DecimalLiteral$1 = $TEXT($S($EXPECT($R7, fail, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*)?)?/"), $E(ExponentPart)));
-      var DecimalLiteral$2 = $TEXT($S($EXPECT($R8, fail, "DecimalLiteral /(?:\\.(?!\\p{ID_Start})[0-9](?:_[0-9]|[0-9])*)/"), $E(ExponentPart)));
+      var DecimalLiteral$1 = $TEXT($S($EXPECT($R7, fail, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*))?/"), $E(ExponentPart)));
+      var DecimalLiteral$2 = $TEXT($S($EXPECT($R8, fail, "DecimalLiteral /(?:\\.[0-9](?:_[0-9]|[0-9])*)/"), $E(ExponentPart)));
       function DecimalLiteral(state) {
         if (state.tokenize) {
           return $TOKEN("DecimalLiteral", state, DecimalLiteral$0(state) || DecimalLiteral$1(state) || DecimalLiteral$2(state));
@@ -3990,7 +4068,19 @@ var Civet = (() => {
           return Dot$0(state);
         }
       }
-      var DotDotDot$0 = $TV($EXPECT($L94, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
+      var DotDot$0 = $TV($EXPECT($L94, fail, 'DotDot ".."'), function($skip, $loc, $0, $1) {
+        return { $loc, token: $1 };
+      });
+      function DotDot(state) {
+        if (state.verbose)
+          console.log("ENTER:", "DotDot");
+        if (state.tokenize) {
+          return $TOKEN("DotDot", state, DotDot$0(state));
+        } else {
+          return DotDot$0(state);
+        }
+      }
+      var DotDotDot$0 = $TV($EXPECT($L95, fail, 'DotDotDot "..."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DotDotDot(state) {
@@ -4002,7 +4092,7 @@ var Civet = (() => {
           return DotDotDot$0(state);
         }
       }
-      var DoubleQuote$0 = $TV($EXPECT($L95, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
+      var DoubleQuote$0 = $TV($EXPECT($L96, fail, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function DoubleQuote(state) {
@@ -4014,7 +4104,7 @@ var Civet = (() => {
           return DoubleQuote$0(state);
         }
       }
-      var Else$0 = $TV($EXPECT($L96, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
+      var Else$0 = $TV($EXPECT($L97, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Else(state) {
@@ -4038,7 +4128,7 @@ var Civet = (() => {
           return Equals$0(state);
         }
       }
-      var Export$0 = $TS($S($EXPECT($L97, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Export$0 = $TS($S($EXPECT($L98, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Export(state) {
@@ -4050,7 +4140,7 @@ var Civet = (() => {
           return Export$0(state);
         }
       }
-      var For$0 = $TS($S($EXPECT($L98, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var For$0 = $TS($S($EXPECT($L99, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function For(state) {
@@ -4062,7 +4152,7 @@ var Civet = (() => {
           return For$0(state);
         }
       }
-      var From$0 = $TS($S($EXPECT($L99, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var From$0 = $TS($S($EXPECT($L100, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function From(state) {
@@ -4074,7 +4164,7 @@ var Civet = (() => {
           return From$0(state);
         }
       }
-      var Function$0 = $TV($EXPECT($L100, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
+      var Function$0 = $TV($EXPECT($L101, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Function(state) {
@@ -4086,7 +4176,7 @@ var Civet = (() => {
           return Function$0(state);
         }
       }
-      var GetOrSet$0 = $TS($S($C($EXPECT($L101, fail, 'GetOrSet "get"'), $EXPECT($L102, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var GetOrSet$0 = $TS($S($C($EXPECT($L102, fail, 'GetOrSet "get"'), $EXPECT($L103, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function GetOrSet(state) {
@@ -4098,7 +4188,7 @@ var Civet = (() => {
           return GetOrSet$0(state);
         }
       }
-      var If$0 = $TV($EXPECT($L103, fail, 'If "if"'), function($skip, $loc, $0, $1) {
+      var If$0 = $TV($EXPECT($L104, fail, 'If "if"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function If(state) {
@@ -4134,7 +4224,7 @@ var Civet = (() => {
           return In$0(state);
         }
       }
-      var LetOrConst$0 = $TV($C($EXPECT($L104, fail, 'LetOrConst "let"'), $EXPECT($L105, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
+      var LetOrConst$0 = $TV($C($EXPECT($L105, fail, 'LetOrConst "let"'), $EXPECT($L106, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function LetOrConst(state) {
@@ -4146,7 +4236,7 @@ var Civet = (() => {
           return LetOrConst$0(state);
         }
       }
-      var Loop$0 = $TS($S($EXPECT($L106, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Loop$0 = $TS($S($EXPECT($L107, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "while(true)" };
       });
       function Loop(state) {
@@ -4158,7 +4248,7 @@ var Civet = (() => {
           return Loop$0(state);
         }
       }
-      var New$0 = $TV($EXPECT($L107, fail, 'New "new"'), function($skip, $loc, $0, $1) {
+      var New$0 = $TV($EXPECT($L108, fail, 'New "new"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function New(state) {
@@ -4170,7 +4260,7 @@ var Civet = (() => {
           return New$0(state);
         }
       }
-      var Of$0 = $TV($EXPECT($L108, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
+      var Of$0 = $TV($EXPECT($L109, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Of(state) {
@@ -4182,7 +4272,7 @@ var Civet = (() => {
           return Of$0(state);
         }
       }
-      var OpenBrace$0 = $TV($EXPECT($L109, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
+      var OpenBrace$0 = $TV($EXPECT($L110, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBrace(state) {
@@ -4194,7 +4284,7 @@ var Civet = (() => {
           return OpenBrace$0(state);
         }
       }
-      var OpenBracket$0 = $TV($EXPECT($L110, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L111, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(state) {
@@ -4206,7 +4296,7 @@ var Civet = (() => {
           return OpenBracket$0(state);
         }
       }
-      var OpenParen$0 = $TV($EXPECT($L111, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
+      var OpenParen$0 = $TV($EXPECT($L112, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenParen(state) {
@@ -4218,7 +4308,7 @@ var Civet = (() => {
           return OpenParen$0(state);
         }
       }
-      var QuestionMark$0 = $TV($EXPECT($L112, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
+      var QuestionMark$0 = $TV($EXPECT($L113, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function QuestionMark(state) {
@@ -4230,7 +4320,7 @@ var Civet = (() => {
           return QuestionMark$0(state);
         }
       }
-      var Return$0 = $TS($S($EXPECT($L113, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Return$0 = $TS($S($EXPECT($L114, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Return(state) {
@@ -4254,7 +4344,7 @@ var Civet = (() => {
           return Semicolon$0(state);
         }
       }
-      var SingleQuote$0 = $TV($EXPECT($L114, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
+      var SingleQuote$0 = $TV($EXPECT($L115, fail, `SingleQuote "'"`), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SingleQuote(state) {
@@ -4278,10 +4368,10 @@ var Civet = (() => {
           return Star$0(state);
         }
       }
-      var Static$0 = $TV($EXPECT($L115, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
+      var Static$0 = $TV($EXPECT($L116, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TS($S($EXPECT($L8, fail, 'Static "@"'), $N($EXPECT($L111, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
+      var Static$1 = $TS($S($EXPECT($L8, fail, 'Static "@"'), $N($EXPECT($L112, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       function Static(state) {
@@ -4291,7 +4381,7 @@ var Civet = (() => {
           return Static$0(state) || Static$1(state);
         }
       }
-      var SubstitutionStart$0 = $TV($EXPECT($L116, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
+      var SubstitutionStart$0 = $TV($EXPECT($L117, fail, 'SubstitutionStart "${"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function SubstitutionStart(state) {
@@ -4303,7 +4393,7 @@ var Civet = (() => {
           return SubstitutionStart$0(state);
         }
       }
-      var Switch$0 = $TS($S($EXPECT($L117, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Switch$0 = $TS($S($EXPECT($L118, fail, 'Switch "switch"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Switch(state) {
@@ -4315,7 +4405,7 @@ var Civet = (() => {
           return Switch$0(state);
         }
       }
-      var Target$0 = $TV($EXPECT($L118, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
+      var Target$0 = $TV($EXPECT($L119, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Target(state) {
@@ -4327,7 +4417,7 @@ var Civet = (() => {
           return Target$0(state);
         }
       }
-      var Throw$0 = $TS($S($EXPECT($L119, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Throw$0 = $TS($S($EXPECT($L120, fail, 'Throw "throw"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Throw(state) {
@@ -4339,7 +4429,7 @@ var Civet = (() => {
           return Throw$0(state);
         }
       }
-      var TripleDoubleQuote$0 = $TV($EXPECT($L120, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
+      var TripleDoubleQuote$0 = $TV($EXPECT($L121, fail, 'TripleDoubleQuote "\\\\\\"\\\\\\"\\\\\\""'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleDoubleQuote(state) {
@@ -4351,7 +4441,7 @@ var Civet = (() => {
           return TripleDoubleQuote$0(state);
         }
       }
-      var TripleSingleQuote$0 = $TV($EXPECT($L121, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
+      var TripleSingleQuote$0 = $TV($EXPECT($L122, fail, `TripleSingleQuote "'''"`), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleSingleQuote(state) {
@@ -4363,7 +4453,7 @@ var Civet = (() => {
           return TripleSingleQuote$0(state);
         }
       }
-      var TripleTick$0 = $TV($EXPECT($L122, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+      var TripleTick$0 = $TV($EXPECT($L123, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "`" };
       });
       function TripleTick(state) {
@@ -4375,7 +4465,7 @@ var Civet = (() => {
           return TripleTick$0(state);
         }
       }
-      var Try$0 = $TV($EXPECT($L123, fail, 'Try "try"'), function($skip, $loc, $0, $1) {
+      var Try$0 = $TV($EXPECT($L124, fail, 'Try "try"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Try(state) {
@@ -4387,7 +4477,7 @@ var Civet = (() => {
           return Try$0(state);
         }
       }
-      var Typeof$0 = $TS($S($EXPECT($L124, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Typeof$0 = $TS($S($EXPECT($L125, fail, 'Typeof "typeof"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Typeof(state) {
@@ -4399,7 +4489,7 @@ var Civet = (() => {
           return Typeof$0(state);
         }
       }
-      var Unless$0 = $TV($EXPECT($L125, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
+      var Unless$0 = $TV($EXPECT($L126, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Unless(state) {
@@ -4411,7 +4501,7 @@ var Civet = (() => {
           return Unless$0(state);
         }
       }
-      var Until$0 = $TS($S($EXPECT($L126, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Until$0 = $TS($S($EXPECT($L127, fail, 'Until "until"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Until(state) {
@@ -4423,7 +4513,7 @@ var Civet = (() => {
           return Until$0(state);
         }
       }
-      var Var$0 = $TV($EXPECT($L127, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
+      var Var$0 = $TV($EXPECT($L128, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Var(state) {
@@ -4435,7 +4525,7 @@ var Civet = (() => {
           return Var$0(state);
         }
       }
-      var Void$0 = $TS($S($EXPECT($L128, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Void$0 = $TS($S($EXPECT($L129, fail, 'Void "void"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Void(state) {
@@ -4447,7 +4537,7 @@ var Civet = (() => {
           return Void$0(state);
         }
       }
-      var When$0 = $TS($S($EXPECT($L129, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var When$0 = $TS($S($EXPECT($L130, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "case" };
       });
       function When(state) {
@@ -4459,7 +4549,7 @@ var Civet = (() => {
           return When$0(state);
         }
       }
-      var While$0 = $TS($S($EXPECT($L130, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var While$0 = $TS($S($EXPECT($L131, fail, 'While "while"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function While(state) {
@@ -4471,7 +4561,7 @@ var Civet = (() => {
           return While$0(state);
         }
       }
-      var Yield$0 = $TS($S($EXPECT($L131, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Yield$0 = $TS($S($EXPECT($L132, fail, 'Yield "yield"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Yield(state) {
@@ -4497,7 +4587,7 @@ var Civet = (() => {
           return JSXElement$0(state) || JSXElement$1(state);
         }
       }
-      var JSXSelfClosingElement$0 = $S($EXPECT($L4, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L132, fail, 'JSXSelfClosingElement "/>"'));
+      var JSXSelfClosingElement$0 = $S($EXPECT($L4, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L133, fail, 'JSXSelfClosingElement "/>"'));
       function JSXSelfClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXSelfClosingElement");
@@ -4517,7 +4607,7 @@ var Civet = (() => {
           return JSXOpeningElement$0(state);
         }
       }
-      var JSXClosingElement$0 = $S($EXPECT($L133, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L55, fail, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L134, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L55, fail, 'JSXClosingElement ">"'));
       function JSXClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXClosingElement");
@@ -4527,7 +4617,7 @@ var Civet = (() => {
           return JSXClosingElement$0(state);
         }
       }
-      var JSXFragment$0 = $S($EXPECT($L134, fail, 'JSXFragment "<>"'), $E(JSXChildren), $EXPECT($L135, fail, 'JSXFragment "</>"'));
+      var JSXFragment$0 = $S($EXPECT($L135, fail, 'JSXFragment "<>"'), $E(JSXChildren), $EXPECT($L136, fail, 'JSXFragment "</>"'));
       function JSXFragment(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXFragment");
@@ -4661,7 +4751,7 @@ var Civet = (() => {
           return TypeDeclaration$0(state);
         }
       }
-      var TypeDeclarationModifier$0 = $S($EXPECT($L136, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
+      var TypeDeclarationModifier$0 = $S($EXPECT($L137, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
       var TypeDeclarationModifier$1 = Export;
       function TypeDeclarationModifier(state) {
         if (state.tokenize) {
@@ -4681,7 +4771,7 @@ var Civet = (() => {
           return TypeDeclarationRest$0(state) || TypeDeclarationRest$1(state) || TypeDeclarationRest$2(state) || TypeDeclarationRest$3(state);
         }
       }
-      var TypeKeyword$0 = $S($EXPECT($L137, fail, 'TypeKeyword "type"'), NonIdContinue);
+      var TypeKeyword$0 = $S($EXPECT($L138, fail, 'TypeKeyword "type"'), NonIdContinue);
       function TypeKeyword(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeKeyword");
@@ -4691,7 +4781,7 @@ var Civet = (() => {
           return TypeKeyword$0(state);
         }
       }
-      var Interface$0 = $S($EXPECT($L138, fail, 'Interface "interface"'), NonIdContinue);
+      var Interface$0 = $S($EXPECT($L139, fail, 'Interface "interface"'), NonIdContinue);
       function Interface(state) {
         if (state.verbose)
           console.log("ENTER:", "Interface");
@@ -4701,7 +4791,7 @@ var Civet = (() => {
           return Interface$0(state);
         }
       }
-      var Namespace$0 = $S($EXPECT($L139, fail, 'Namespace "namespace"'), NonIdContinue);
+      var Namespace$0 = $S($EXPECT($L140, fail, 'Namespace "namespace"'), NonIdContinue);
       function Namespace(state) {
         if (state.verbose)
           console.log("ENTER:", "Namespace");
@@ -4801,7 +4891,7 @@ var Civet = (() => {
           return NestedTypeDeclaration$0(state);
         }
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R37, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L140, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R38, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R37, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L141, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R38, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
       function TypeIndexSignature(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeIndexSignature");
@@ -4832,7 +4922,7 @@ var Civet = (() => {
           return TypeSuffix$0(state);
         }
       }
-      var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L141, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ReturnTypeSuffix$0 = $TS($S(__, Colon, $E($S(__, $EXPECT($L142, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function($skip, $loc, $0, $1, $2, $3, $4) {
         if (!$3)
           $0.splice(2, 1);
         if ($1.length === 0)
@@ -4915,9 +5005,9 @@ var Civet = (() => {
           return TypeUnarySuffix$0(state) || TypeUnarySuffix$1(state);
         }
       }
-      var TypeUnaryOp$0 = $EXPECT($L142, fail, 'TypeUnaryOp "keyof"');
-      var TypeUnaryOp$1 = $EXPECT($L124, fail, 'TypeUnaryOp "typeof"');
-      var TypeUnaryOp$2 = $EXPECT($L143, fail, 'TypeUnaryOp "infer"');
+      var TypeUnaryOp$0 = $EXPECT($L143, fail, 'TypeUnaryOp "keyof"');
+      var TypeUnaryOp$1 = $EXPECT($L125, fail, 'TypeUnaryOp "typeof"');
+      var TypeUnaryOp$2 = $EXPECT($L144, fail, 'TypeUnaryOp "infer"');
       function TypeUnaryOp(state) {
         if (state.tokenize) {
           return $TOKEN("TypeUnaryOp", state, TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state));
@@ -5007,10 +5097,10 @@ var Civet = (() => {
         }
       }
       var TypeLiteral$0 = Literal;
-      var TypeLiteral$1 = $TV($EXPECT($L128, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$1 = $TV($EXPECT($L129, fail, 'TypeLiteral "void"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "void" };
       });
-      var TypeLiteral$2 = $TV($EXPECT($L144, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
+      var TypeLiteral$2 = $TV($EXPECT($L145, fail, 'TypeLiteral "[]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: "[]" };
       });
       function TypeLiteral(state) {
@@ -5125,7 +5215,7 @@ var Civet = (() => {
           return CivetPrologue$0(state) || CivetPrologue$1(state);
         }
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L145, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R41, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L146, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R41, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
         var options = $2;
         return {
           type: "CivetPrologue",
@@ -5598,6 +5688,7 @@ var Civet = (() => {
           }
           return spacing;
         };
+        const initialSpacingRe = /^(?:\r?\n|\n)*((?:\r?\n|\n)\s+)/;
         module.dedentBlockSubstitutions = function($02) {
           const [s, strWithSubstitutions, e] = $02;
           if (strWithSubstitutions.length === 0) {
@@ -5606,7 +5697,7 @@ var Civet = (() => {
           let initialSpacing, i = 0, l = strWithSubstitutions.length, results = [s];
           const { token } = strWithSubstitutions[0];
           if (token) {
-            initialSpacing = token.match(/^(\r?\n|\n)\s+/);
+            initialSpacing = token.match(initialSpacingRe);
           } else {
             initialSpacing = false;
           }
@@ -5631,9 +5722,9 @@ var Civet = (() => {
         };
         module.dedentBlockString = function({ $loc: $loc2, token: str }, spacing, trim = true) {
           if (spacing == null)
-            spacing = str.match(/^(\r?\n|\n)[ \t]+/);
+            spacing = str.match(initialSpacingRe);
           if (spacing) {
-            str = str.replaceAll(spacing[0], "\n");
+            str = str.replaceAll(spacing[1], "\n");
             const l = spacing.length;
             $loc2.pos += l;
             $loc2.length -= l;
@@ -5658,7 +5749,7 @@ var Civet = (() => {
           return Init$0(state);
         }
       }
-      var Indent$0 = $TV($Q($C($EXPECT($L146, fail, 'Indent "  "'), $EXPECT($L147, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
+      var Indent$0 = $TV($Q($C($EXPECT($L147, fail, 'Indent "  "'), $EXPECT($L148, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
         const level = $1.length;
         return {
           $loc,