@danielx/civet 0.4.1 → 0.4.3

package/dist/browser.js

@@ -505,6 +505,7 @@ var Civet = (() => {
         PropertyName,
         MethodDefinition,
         MethodModifier,
+        ConstructorShorthand,
         MethodSignature,
         ClassElementName,
         PrivateIdentifier,
@@ -583,6 +584,8 @@ var Civet = (() => {
         SingleStringCharacter,
         TripleDoubleStringCharacters,
         TripleSingleStringCharacters,
+        CoffeeStringSubstitution,
+        CoffeeSubstitutionStart,
         RegularExpressionLiteral,
         RegularExpressionBody,
         RegExpCharacter,
@@ -642,6 +645,7 @@ var Civet = (() => {
         Target,
         TripleDoubleQuote,
         TripleSingleQuote,
+        TripleTick,
         Try,
         Unless,
         Var,
@@ -717,7 +721,6 @@ var Civet = (() => {
         Init,
         Indent,
         TrackIndent,
-        RestoreIndent,
         Samedent,
         IndentedFurther,
         PushIndent,
@@ -812,59 +815,61 @@ var Civet = (() => {
       var $L85 = $L(":=");
       var $L86 = $L('"');
       var $L87 = $L("'");
-      var $L88 = $L("${");
-      var $L89 = $L("/*");
-      var $L90 = $L("*/");
-      var $L91 = $L("###");
-      var $L92 = $L("as");
-      var $L93 = $L("async");
-      var $L94 = $L("await");
-      var $L95 = $L("catch");
-      var $L96 = $L("class");
-      var $L97 = $L(":");
-      var $L98 = $L(".");
-      var $L99 = $L("else");
-      var $L100 = $L("export");
-      var $L101 = $L("for");
-      var $L102 = $L("from");
-      var $L103 = $L("function");
-      var $L104 = $L("get");
-      var $L105 = $L("set");
-      var $L106 = $L("if");
-      var $L107 = $L("let");
-      var $L108 = $L("const");
-      var $L109 = $L("loop");
-      var $L110 = $L("new");
-      var $L111 = $L("of");
-      var $L112 = $L("{");
-      var $L113 = $L("[");
-      var $L114 = $L("(");
-      var $L115 = $L("?");
-      var $L116 = $L("return");
-      var $L117 = $L("static");
-      var $L118 = $L("switch");
-      var $L119 = $L("target");
-      var $L120 = $L('"""');
-      var $L121 = $L("'''");
-      var $L122 = $L("try");
-      var $L123 = $L("unless");
-      var $L124 = $L("var");
-      var $L125 = $L("when");
-      var $L126 = $L("/>");
-      var $L127 = $L("</");
-      var $L128 = $L("<>");
-      var $L129 = $L("</>");
-      var $L130 = $L("declare");
-      var $L131 = $L("type");
-      var $L132 = $L("interface");
-      var $L133 = $L("namespace");
-      var $L134 = $L("readonly");
-      var $L135 = $L("asserts");
-      var $L136 = $L("keyof");
-      var $L137 = $L("infer");
-      var $L138 = $L("[]");
-      var $L139 = $L("  ");
-      var $L140 = $L("	");
+      var $L88 = $L("#{");
+      var $L89 = $L("${");
+      var $L90 = $L("/*");
+      var $L91 = $L("*/");
+      var $L92 = $L("###");
+      var $L93 = $L("as");
+      var $L94 = $L("async");
+      var $L95 = $L("await");
+      var $L96 = $L("catch");
+      var $L97 = $L("class");
+      var $L98 = $L(":");
+      var $L99 = $L(".");
+      var $L100 = $L("else");
+      var $L101 = $L("export");
+      var $L102 = $L("for");
+      var $L103 = $L("from");
+      var $L104 = $L("function");
+      var $L105 = $L("get");
+      var $L106 = $L("set");
+      var $L107 = $L("if");
+      var $L108 = $L("let");
+      var $L109 = $L("const");
+      var $L110 = $L("loop");
+      var $L111 = $L("new");
+      var $L112 = $L("of");
+      var $L113 = $L("{");
+      var $L114 = $L("[");
+      var $L115 = $L("(");
+      var $L116 = $L("?");
+      var $L117 = $L("return");
+      var $L118 = $L("static");
+      var $L119 = $L("switch");
+      var $L120 = $L("target");
+      var $L121 = $L('"""');
+      var $L122 = $L("'''");
+      var $L123 = $L("```");
+      var $L124 = $L("try");
+      var $L125 = $L("unless");
+      var $L126 = $L("var");
+      var $L127 = $L("when");
+      var $L128 = $L("/>");
+      var $L129 = $L("</");
+      var $L130 = $L("<>");
+      var $L131 = $L("</>");
+      var $L132 = $L("declare");
+      var $L133 = $L("type");
+      var $L134 = $L("interface");
+      var $L135 = $L("namespace");
+      var $L136 = $L("readonly");
+      var $L137 = $L("asserts");
+      var $L138 = $L("keyof");
+      var $L139 = $L("infer");
+      var $L140 = $L("[]");
+      var $L141 = $L("  ");
+      var $L142 = $L("	");
       var $R0 = $R(new RegExp("(of)(?!\\p{ID_Continue})", "suy"));
       var $R1 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
       var $R2 = $R(new RegExp("[!~+-]", "suy"));
@@ -876,7 +881,7 @@ var Civet = (() => {
       var $R8 = $R(new RegExp("0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_[0-9a-fA-F])*", "suy"));
       var $R9 = $R(new RegExp('(?:\\\\.|[^"])+', "suy"));
       var $R10 = $R(new RegExp("(?:\\\\.|[^'])+", "suy"));
-      var $R11 = $R(new RegExp('(?:"(?!"")|\\\\.|[^"])*', "suy"));
+      var $R11 = $R(new RegExp('(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+', "suy"));
       var $R12 = $R(new RegExp("(?:'(?!'')|\\\\.|[^'])*", "suy"));
       var $R13 = $R(new RegExp("[*\\/\\r\\n]", "suy"));
       var $R14 = $R(new RegExp("(?:\\\\.|[^\\/\\r\\n])+", "suy"));
@@ -941,7 +946,7 @@ var Civet = (() => {
           return Arguments$0(state) || Arguments$1(state);
         }
       }
-      var ArgumentsWithTrailingCallExpressions$0 = $TS($S(TrackIndent, $C($S(Arguments, $Q($S($Y(EOS), Samedent, $N($EXPECT($L0, fail, 'ArgumentsWithTrailingCallExpressions "`"')), CallExpressionRest)), RestoreIndent), RestoreIndent)), function($skip, $loc, $0, $1, $2) {
+      var ArgumentsWithTrailingCallExpressions$0 = $TS($S(TrackIndent, $C($S(Arguments, $Q($S($Y(EOS), Samedent, $N($EXPECT($L0, fail, 'ArgumentsWithTrailingCallExpressions "`"')), CallExpressionRest)), PopIndent), PopIndent)), function($skip, $loc, $0, $1, $2) {
         if (!$2)
           return $skip;
         return $2;
@@ -2038,14 +2043,25 @@ var Civet = (() => {
           return MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state) || MethodModifier$3(state);
         }
       }
-      var MethodSignature$0 = $S($E(MethodModifier), ClassElementName, $Q(_), Parameters);
-      function MethodSignature(state) {
+      var ConstructorShorthand$0 = $TV($EXPECT($L11, fail, 'ConstructorShorthand "@"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: "constructor" };
+      });
+      function ConstructorShorthand(state) {
         if (state.verbose)
-          console.log("ENTER:", "MethodSignature");
+          console.log("ENTER:", "ConstructorShorthand");
+        if (state.tokenize) {
+          return $TOKEN("ConstructorShorthand", state, ConstructorShorthand$0(state));
+        } else {
+          return ConstructorShorthand$0(state);
+        }
+      }
+      var MethodSignature$0 = $S(ConstructorShorthand, Parameters);
+      var MethodSignature$1 = $S($E(MethodModifier), ClassElementName, $Q(_), Parameters);
+      function MethodSignature(state) {
         if (state.tokenize) {
-          return $TOKEN("MethodSignature", state, MethodSignature$0(state));
+          return $TOKEN("MethodSignature", state, MethodSignature$0(state) || MethodSignature$1(state));
         } else {
-          return MethodSignature$0(state);
+          return MethodSignature$0(state) || MethodSignature$1(state);
         }
       }
       var ClassElementName$0 = PropertyName;
@@ -2932,11 +2948,38 @@ var Civet = (() => {
           return HexLiteral$0(state);
         }
       }
-      var StringLiteral$0 = $TS($S(TripleDoubleQuote, TripleDoubleStringCharacters, TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
+      var StringLiteral$0 = $TS($S(TripleDoubleQuote, $Q($C(TripleDoubleStringCharacters, CoffeeStringSubstitution)), TripleDoubleQuote), function($skip, $loc, $0, $1, $2, $3) {
         var s = $1;
-        var str = $2;
+        var strWithSubstitutions = $2;
         var e = $3;
-        return [s, module.dedentBlockString(str), e];
+        if (strWithSubstitutions.length === 0) {
+          return $0;
+        }
+        let initialSpacing, i = 0, l = strWithSubstitutions.length, results = [s];
+        const { token } = strWithSubstitutions[0];
+        if (token) {
+          initialSpacing = token.match(/^(\r?\n|\n)\s+/);
+        } else {
+          initialSpacing = false;
+        }
+        while (i < l) {
+          let segment = strWithSubstitutions[i];
+          if (segment.token) {
+            segment = module.dedentBlockString(segment, initialSpacing, false);
+            if (i === 0) {
+              segment.token = segment.token.replace(/^(\r?\n|\n)/, "");
+            }
+            if (i === l - 1) {
+              segment.token = segment.token.replace(/(\r?\n|\n)[ \t]*$/, "");
+            }
+            results.push(segment);
+          } else {
+            results.push(segment);
+          }
+          i++;
+        }
+        results.push(e);
+        return results;
       });
       var StringLiteral$1 = $TS($S(TripleSingleQuote, TripleSingleStringCharacters, TripleSingleQuote), function($skip, $loc, $0, $1, $2, $3) {
         var s = $1;
@@ -2977,7 +3020,7 @@ var Civet = (() => {
           return SingleStringCharacter$0(state);
         }
       }
-      var TripleDoubleStringCharacters$0 = $TR($EXPECT($R11, fail, 'TripleDoubleStringCharacters /(?:"(?!"")|\\\\.|[^"])*/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var TripleDoubleStringCharacters$0 = $TR($EXPECT($R11, fail, 'TripleDoubleStringCharacters /(?:"(?!"")|#(?!\\{)|\\\\.|[^#"])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function TripleDoubleStringCharacters(state) {
@@ -3001,6 +3044,28 @@ var Civet = (() => {
           return TripleSingleStringCharacters$0(state);
         }
       }
+      var CoffeeStringSubstitution$0 = $S(CoffeeSubstitutionStart, Expression, __, CloseBrace);
+      function CoffeeStringSubstitution(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeStringSubstitution");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeStringSubstitution", state, CoffeeStringSubstitution$0(state));
+        } else {
+          return CoffeeStringSubstitution$0(state);
+        }
+      }
+      var CoffeeSubstitutionStart$0 = $TV($EXPECT($L88, fail, 'CoffeeSubstitutionStart "#{"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: "${" };
+      });
+      function CoffeeSubstitutionStart(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeSubstitutionStart");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeSubstitutionStart", state, CoffeeSubstitutionStart$0(state));
+        } else {
+          return CoffeeSubstitutionStart$0(state);
+        }
+      }
       var RegularExpressionLiteral$0 = $TV($TEXT($S($EXPECT($L45, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L45, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
@@ -3053,7 +3118,7 @@ var Civet = (() => {
           return TemplateLiteral$0(state);
         }
       }
-      var TemplateSubstitution$0 = $S($EXPECT($L88, fail, 'TemplateSubstitution "${"'), Expression, __, CloseBrace);
+      var TemplateSubstitution$0 = $S($EXPECT($L89, fail, 'TemplateSubstitution "${"'), Expression, __, CloseBrace);
       function TemplateSubstitution(state) {
         if (state.verbose)
           console.log("ENTER:", "TemplateSubstitution");
@@ -3112,7 +3177,7 @@ var Civet = (() => {
           return MultiLineComment$0(state) || MultiLineComment$1(state);
         }
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L89, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L90, fail, 'JSMultiLineComment "*/"')), $EXPECT($R19, fail, "JSMultiLineComment /./"))), $EXPECT($L90, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L90, fail, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L91, fail, 'JSMultiLineComment "*/"')), $EXPECT($R19, fail, "JSMultiLineComment /./"))), $EXPECT($L91, fail, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function JSMultiLineComment(state) {
@@ -3138,7 +3203,7 @@ var Civet = (() => {
           return CoffeeSingleLineComment$0(state);
         }
       }
-      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L91, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L91, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L90, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R19, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L91, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
+      var CoffeeMultiLineComment$0 = $TS($S($EXPECT($L92, fail, 'CoffeeMultiLineComment "###"'), $TEXT($Q($S($N($C($EXPECT($L92, fail, 'CoffeeMultiLineComment "###"'), $EXPECT($L91, fail, 'CoffeeMultiLineComment "*/"'))), $EXPECT($R19, fail, "CoffeeMultiLineComment /./")))), $EXPECT($L92, fail, 'CoffeeMultiLineComment "###"')), function($skip, $loc, $0, $1, $2, $3) {
         return { $loc, token: `/*${$2}*/` };
       });
       function CoffeeMultiLineComment(state) {
@@ -3150,7 +3215,7 @@ var Civet = (() => {
           return CoffeeMultiLineComment$0(state);
         }
       }
-      var InlineComment$0 = $TV($TEXT($S($EXPECT($L89, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L90, fail, 'InlineComment "*/"')), $EXPECT($R21, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L90, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var InlineComment$0 = $TV($TEXT($S($EXPECT($L90, fail, 'InlineComment "/*"'), $TEXT($Q($S($N($EXPECT($L91, fail, 'InlineComment "*/"')), $EXPECT($R21, fail, "InlineComment /[^\\r\\n]/")))), $EXPECT($L91, fail, 'InlineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function InlineComment(state) {
@@ -3259,7 +3324,7 @@ var Civet = (() => {
           return Loc$0(state);
         }
       }
-      var As$0 = $TS($S($EXPECT($L92, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var As$0 = $TS($S($EXPECT($L93, fail, 'As "as"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function As(state) {
@@ -3271,7 +3336,7 @@ var Civet = (() => {
           return As$0(state);
         }
       }
-      var Async$0 = $TV($EXPECT($L93, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
+      var Async$0 = $TV($EXPECT($L94, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Async(state) {
@@ -3283,7 +3348,7 @@ var Civet = (() => {
           return Async$0(state);
         }
       }
-      var Await$0 = $TS($S($EXPECT($L94, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Await$0 = $TS($S($EXPECT($L95, fail, 'Await "await"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Await(state) {
@@ -3295,7 +3360,7 @@ var Civet = (() => {
           return Await$0(state);
         }
       }
-      var Catch$0 = $TV($EXPECT($L95, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
+      var Catch$0 = $TV($EXPECT($L96, fail, 'Catch "catch"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Catch(state) {
@@ -3307,7 +3372,7 @@ var Civet = (() => {
           return Catch$0(state);
         }
       }
-      var Class$0 = $TV($EXPECT($L96, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
+      var Class$0 = $TV($EXPECT($L97, fail, 'Class "class"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Class(state) {
@@ -3355,7 +3420,7 @@ var Civet = (() => {
           return CloseParen$0(state);
         }
       }
-      var Colon$0 = $TV($EXPECT($L97, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
+      var Colon$0 = $TV($EXPECT($L98, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Colon(state) {
@@ -3367,7 +3432,7 @@ var Civet = (() => {
           return Colon$0(state);
         }
       }
-      var Dot$0 = $TV($EXPECT($L98, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
+      var Dot$0 = $TV($EXPECT($L99, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Dot(state) {
@@ -3379,7 +3444,7 @@ var Civet = (() => {
           return Dot$0(state);
         }
       }
-      var Else$0 = $TV($EXPECT($L99, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
+      var Else$0 = $TV($EXPECT($L100, fail, 'Else "else"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Else(state) {
@@ -3403,7 +3468,7 @@ var Civet = (() => {
           return Equals$0(state);
         }
       }
-      var Export$0 = $TS($S($EXPECT($L100, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Export$0 = $TS($S($EXPECT($L101, fail, 'Export "export"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Export(state) {
@@ -3415,7 +3480,7 @@ var Civet = (() => {
           return Export$0(state);
         }
       }
-      var For$0 = $TS($S($EXPECT($L101, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var For$0 = $TS($S($EXPECT($L102, fail, 'For "for"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function For(state) {
@@ -3427,7 +3492,7 @@ var Civet = (() => {
           return For$0(state);
         }
       }
-      var From$0 = $TS($S($EXPECT($L102, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var From$0 = $TS($S($EXPECT($L103, fail, 'From "from"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function From(state) {
@@ -3439,7 +3504,7 @@ var Civet = (() => {
           return From$0(state);
         }
       }
-      var Function$0 = $TV($EXPECT($L103, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
+      var Function$0 = $TV($EXPECT($L104, fail, 'Function "function"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Function(state) {
@@ -3451,7 +3516,7 @@ var Civet = (() => {
           return Function$0(state);
         }
       }
-      var GetOrSet$0 = $TS($S($C($EXPECT($L104, fail, 'GetOrSet "get"'), $EXPECT($L105, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var GetOrSet$0 = $TS($S($C($EXPECT($L105, fail, 'GetOrSet "get"'), $EXPECT($L106, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function GetOrSet(state) {
@@ -3463,7 +3528,7 @@ var Civet = (() => {
           return GetOrSet$0(state);
         }
       }
-      var If$0 = $TV($EXPECT($L106, fail, 'If "if"'), function($skip, $loc, $0, $1) {
+      var If$0 = $TV($EXPECT($L107, fail, 'If "if"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function If(state) {
@@ -3499,7 +3564,7 @@ var Civet = (() => {
           return In$0(state);
         }
       }
-      var LetOrConst$0 = $TV($C($EXPECT($L107, fail, 'LetOrConst "let"'), $EXPECT($L108, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
+      var LetOrConst$0 = $TV($C($EXPECT($L108, fail, 'LetOrConst "let"'), $EXPECT($L109, fail, 'LetOrConst "const"')), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function LetOrConst(state) {
@@ -3511,7 +3576,7 @@ var Civet = (() => {
           return LetOrConst$0(state);
         }
       }
-      var Loop$0 = $TS($S($EXPECT($L109, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Loop$0 = $TS($S($EXPECT($L110, fail, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "while(true)" };
       });
       function Loop(state) {
@@ -3523,7 +3588,7 @@ var Civet = (() => {
           return Loop$0(state);
         }
       }
-      var New$0 = $TV($EXPECT($L110, fail, 'New "new"'), function($skip, $loc, $0, $1) {
+      var New$0 = $TV($EXPECT($L111, fail, 'New "new"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function New(state) {
@@ -3535,7 +3600,7 @@ var Civet = (() => {
           return New$0(state);
         }
       }
-      var Of$0 = $TV($EXPECT($L111, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
+      var Of$0 = $TV($EXPECT($L112, fail, 'Of "of"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Of(state) {
@@ -3547,7 +3612,7 @@ var Civet = (() => {
           return Of$0(state);
         }
       }
-      var OpenBrace$0 = $TV($EXPECT($L112, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
+      var OpenBrace$0 = $TV($EXPECT($L113, fail, 'OpenBrace "{"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBrace(state) {
@@ -3559,7 +3624,7 @@ var Civet = (() => {
           return OpenBrace$0(state);
         }
       }
-      var OpenBracket$0 = $TV($EXPECT($L113, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
+      var OpenBracket$0 = $TV($EXPECT($L114, fail, 'OpenBracket "["'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenBracket(state) {
@@ -3571,7 +3636,7 @@ var Civet = (() => {
           return OpenBracket$0(state);
         }
       }
-      var OpenParen$0 = $TV($EXPECT($L114, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
+      var OpenParen$0 = $TV($EXPECT($L115, fail, 'OpenParen "("'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function OpenParen(state) {
@@ -3583,7 +3648,7 @@ var Civet = (() => {
           return OpenParen$0(state);
         }
       }
-      var QuestionMark$0 = $TV($EXPECT($L115, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
+      var QuestionMark$0 = $TV($EXPECT($L116, fail, 'QuestionMark "?"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function QuestionMark(state) {
@@ -3595,7 +3660,7 @@ var Civet = (() => {
           return QuestionMark$0(state);
         }
       }
-      var Return$0 = $TS($S($EXPECT($L116, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var Return$0 = $TS($S($EXPECT($L117, fail, 'Return "return"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Return(state) {
@@ -3619,10 +3684,10 @@ var Civet = (() => {
           return Semicolon$0(state);
         }
       }
-      var Static$0 = $TV($EXPECT($L117, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
+      var Static$0 = $TV($EXPECT($L118, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Static$1 = $TV($EXPECT($L11, fail, 'Static "@"'), function($skip, $loc, $0, $1) {
+      var Static$1 = $TS($S($EXPECT($L11, fail, 'Static "@"'), $N($EXPECT($L115, fail, 'Static "("'))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "static " };
       });
       function Static(state) {
@@ -3632,7 +3697,7 @@ var Civet = (() => {
           return Static$0(state) || Static$1(state);
         }
       }
-      var Switch$0 = $TV($EXPECT($L118, fail, 'Switch "switch"'), function($skip, $loc, $0, $1) {
+      var Switch$0 = $TV($EXPECT($L119, fail, 'Switch "switch"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Switch(state) {
@@ -3644,7 +3709,7 @@ var Civet = (() => {
           return Switch$0(state);
         }
       }
-      var Target$0 = $TV($EXPECT($L119, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
+      var Target$0 = $TV($EXPECT($L120, fail, 'Target "target"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Target(state) {
@@ -3656,7 +3721,7 @@ var Civet = (() => {
           return Target$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) {
@@ -3668,7 +3733,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) {
@@ -3680,7 +3745,19 @@ var Civet = (() => {
           return TripleSingleQuote$0(state);
         }
       }
-      var Try$0 = $TV($EXPECT($L122, fail, 'Try "try"'), function($skip, $loc, $0, $1) {
+      var TripleTick$0 = $TV($EXPECT($L123, fail, 'TripleTick "```"'), function($skip, $loc, $0, $1) {
+        return { $loc, token: "`" };
+      });
+      function TripleTick(state) {
+        if (state.verbose)
+          console.log("ENTER:", "TripleTick");
+        if (state.tokenize) {
+          return $TOKEN("TripleTick", state, TripleTick$0(state));
+        } else {
+          return TripleTick$0(state);
+        }
+      }
+      var Try$0 = $TV($EXPECT($L124, fail, 'Try "try"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Try(state) {
@@ -3692,7 +3769,7 @@ var Civet = (() => {
           return Try$0(state);
         }
       }
-      var Unless$0 = $TV($EXPECT($L123, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
+      var Unless$0 = $TV($EXPECT($L125, fail, 'Unless "unless"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Unless(state) {
@@ -3704,7 +3781,7 @@ var Civet = (() => {
           return Unless$0(state);
         }
       }
-      var Var$0 = $TV($EXPECT($L124, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
+      var Var$0 = $TV($EXPECT($L126, fail, 'Var "var"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Var(state) {
@@ -3716,7 +3793,7 @@ var Civet = (() => {
           return Var$0(state);
         }
       }
-      var When$0 = $TS($S($EXPECT($L125, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var When$0 = $TS($S($EXPECT($L127, fail, 'When "when"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "case" };
       });
       function When(state) {
@@ -3742,7 +3819,7 @@ var Civet = (() => {
           return JSXElement$0(state) || JSXElement$1(state);
         }
       }
-      var JSXSelfClosingElement$0 = $S($EXPECT($L7, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L126, fail, 'JSXSelfClosingElement "/>"'));
+      var JSXSelfClosingElement$0 = $S($EXPECT($L7, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L128, fail, 'JSXSelfClosingElement "/>"'));
       function JSXSelfClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXSelfClosingElement");
@@ -3762,7 +3839,7 @@ var Civet = (() => {
           return JSXOpeningElement$0(state);
         }
       }
-      var JSXClosingElement$0 = $S($EXPECT($L127, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L54, fail, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L129, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L54, fail, 'JSXClosingElement ">"'));
       function JSXClosingElement(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXClosingElement");
@@ -3772,7 +3849,7 @@ var Civet = (() => {
           return JSXClosingElement$0(state);
         }
       }
-      var JSXFragment$0 = $S($EXPECT($L128, fail, 'JSXFragment "<>"'), $E(JSXChildren), $EXPECT($L129, fail, 'JSXFragment "</>"'));
+      var JSXFragment$0 = $S($EXPECT($L130, fail, 'JSXFragment "<>"'), $E(JSXChildren), $EXPECT($L131, fail, 'JSXFragment "</>"'));
       function JSXFragment(state) {
         if (state.verbose)
           console.log("ENTER:", "JSXFragment");
@@ -3906,7 +3983,7 @@ var Civet = (() => {
           return TypeDeclaration$0(state);
         }
       }
-      var TypeDeclarationModifier$0 = $S($EXPECT($L130, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
+      var TypeDeclarationModifier$0 = $S($EXPECT($L132, fail, 'TypeDeclarationModifier "declare"'), NonIdContinue);
       var TypeDeclarationModifier$1 = Export;
       function TypeDeclarationModifier(state) {
         if (state.tokenize) {
@@ -3925,7 +4002,7 @@ var Civet = (() => {
           return TypeDeclarationRest$0(state) || TypeDeclarationRest$1(state) || TypeDeclarationRest$2(state);
         }
       }
-      var TypeKeyword$0 = $S($EXPECT($L131, fail, 'TypeKeyword "type"'), NonIdContinue);
+      var TypeKeyword$0 = $S($EXPECT($L133, fail, 'TypeKeyword "type"'), NonIdContinue);
       function TypeKeyword(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeKeyword");
@@ -3935,7 +4012,7 @@ var Civet = (() => {
           return TypeKeyword$0(state);
         }
       }
-      var Interface$0 = $S($EXPECT($L132, fail, 'Interface "interface"'), NonIdContinue);
+      var Interface$0 = $S($EXPECT($L134, fail, 'Interface "interface"'), NonIdContinue);
       function Interface(state) {
         if (state.verbose)
           console.log("ENTER:", "Interface");
@@ -3945,7 +4022,7 @@ var Civet = (() => {
           return Interface$0(state);
         }
       }
-      var Namespace$0 = $S($EXPECT($L133, fail, 'Namespace "namespace"'), NonIdContinue);
+      var Namespace$0 = $S($EXPECT($L135, fail, 'Namespace "namespace"'), NonIdContinue);
       function Namespace(state) {
         if (state.verbose)
           console.log("ENTER:", "Namespace");
@@ -4049,7 +4126,7 @@ var Civet = (() => {
           return NestedTypeDeclaration$0(state);
         }
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R31, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L134, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R32, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R31, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L136, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R32, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
       function TypeIndexSignature(state) {
         if (state.verbose)
           console.log("ENTER:", "TypeIndexSignature");
@@ -4080,7 +4157,7 @@ var Civet = (() => {
           return TypeSuffix$0(state);
         }
       }
-      var ReturnTypeSuffix$0 = $T($S(__, Colon, $E($S(__, $EXPECT($L135, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function(value) {
+      var ReturnTypeSuffix$0 = $T($S(__, Colon, $E($S(__, $EXPECT($L137, fail, 'ReturnTypeSuffix "asserts"'), NonIdContinue)), TypePredicate), function(value) {
         return { "ts": true, "children": value };
       });
       function ReturnTypeSuffix(state) {
@@ -4142,9 +4219,9 @@ var Civet = (() => {
           return TypeUnarySuffix$0(state);
         }
       }
-      var TypeUnaryOp$0 = $EXPECT($L136, fail, 'TypeUnaryOp "keyof"');
+      var TypeUnaryOp$0 = $EXPECT($L138, fail, 'TypeUnaryOp "keyof"');
       var TypeUnaryOp$1 = $EXPECT($L72, fail, 'TypeUnaryOp "typeof"');
-      var TypeUnaryOp$2 = $EXPECT($L137, fail, 'TypeUnaryOp "infer"');
+      var TypeUnaryOp$2 = $EXPECT($L139, fail, 'TypeUnaryOp "infer"');
       function TypeUnaryOp(state) {
         if (state.tokenize) {
           return $TOKEN("TypeUnaryOp", state, TypeUnaryOp$0(state) || TypeUnaryOp$1(state) || TypeUnaryOp$2(state));
@@ -4186,7 +4263,7 @@ var Civet = (() => {
       }
       var TypeLiteral$0 = Literal;
       var TypeLiteral$1 = $EXPECT($L71, fail, 'TypeLiteral "void"');
-      var TypeLiteral$2 = $EXPECT($L138, fail, 'TypeLiteral "[]"');
+      var TypeLiteral$2 = $EXPECT($L140, fail, 'TypeLiteral "[]"');
       function TypeLiteral(state) {
         if (state.tokenize) {
           return $TOKEN("TypeLiteral", state, TypeLiteral$0(state) || TypeLiteral$1(state) || TypeLiteral$2(state));
@@ -4466,8 +4543,6 @@ var Civet = (() => {
       }
       var Init$0 = $TS($S($E(Shebang), DirectivePrologue, $EXPECT($L1, fail, 'Init ""')), function($skip, $loc, $0, $1, $2, $3) {
         var directives = $2;
-        module.lastIndent = 0;
-        module.trackedIndents = [0];
         module.currentIndent = 0;
         module.indentLevels = [0];
         module.verbose = false;
@@ -4475,15 +4550,19 @@ var Civet = (() => {
           const compatRe = /use coffee-compat/;
           module.coffeeCompat = directives.some((d) => d[1].token?.match(compatRe));
         }
-        module.dedentBlockString = function({ $loc: $loc2, token: str }) {
-          const spacing = str.match(/^(\r?\n|\n)\s+/);
+        module.dedentBlockString = function({ $loc: $loc2, token: str }, spacing, trim = true) {
+          if (spacing == null)
+            spacing = str.match(/^(\r?\n|\n)[ \t]+/);
           if (spacing) {
             str = str.replaceAll(spacing[0], "\n");
             const l = spacing.length;
             $loc2.pos += l;
             $loc2.length -= l;
           }
-          str = str.replace(/^(\r?\n|\n)/, "").replace(/(\r?\n|\n)[ \t]*$/, "").replace(/(`|\$)/g, "\\$1");
+          if (trim) {
+            str = str.replace(/^(\r?\n|\n)/, "").replace(/(\r?\n|\n)[ \t]*$/, "");
+          }
+          str = str.replace(/(`|\$)/g, "\\$1");
           return {
             $loc: $loc2,
             token: str
@@ -4500,9 +4579,8 @@ var Civet = (() => {
           return Init$0(state);
         }
       }
-      var Indent$0 = $TV($Q($C($EXPECT($L139, fail, 'Indent "  "'), $EXPECT($L140, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
+      var Indent$0 = $TV($Q($C($EXPECT($L141, fail, 'Indent "  "'), $EXPECT($L142, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
         const level = $1.length;
-        module.lastIndent = level;
         return {
           $loc,
           token: "".padStart(level * 2),
@@ -4519,7 +4597,7 @@ var Civet = (() => {
         }
       }
       var TrackIndent$0 = $TV($EXPECT($L1, fail, 'TrackIndent ""'), function($skip, $loc, $0, $1) {
-        module.trackedIndents.push(module.lastIndent);
+        module.indentLevels.push(module.currentIndent);
       });
       function TrackIndent(state) {
         if (state.verbose)
@@ -4530,22 +4608,11 @@ var Civet = (() => {
           return TrackIndent$0(state);
         }
       }
-      var RestoreIndent$0 = $TV($EXPECT($L1, fail, 'RestoreIndent ""'), function($skip, $loc, $0, $1) {
-        const topLevel = module.trackedIndents.pop();
-        module.lastIndent = topLevel;
-      });
-      function RestoreIndent(state) {
-        if (state.verbose)
-          console.log("ENTER:", "RestoreIndent");
-        if (state.tokenize) {
-          return $TOKEN("RestoreIndent", state, RestoreIndent$0(state));
-        } else {
-          return RestoreIndent$0(state);
-        }
-      }
       var Samedent$0 = $TS($S($E(EOS), Indent), function($skip, $loc, $0, $1, $2) {
         var indent = $2;
-        if (indent.level === module.trackedIndents[module.trackedIndents.length - 1]) {
+        const { level } = indent;
+        const currentIndent = module.indentLevels[module.indentLevels.length - 1];
+        if (level === currentIndent) {
           return $0;
         }
         return $skip;
@@ -4561,7 +4628,9 @@ var Civet = (() => {
       }
       var IndentedFurther$0 = $TS($S($E(EOS), Indent), function($skip, $loc, $0, $1, $2) {
         var indent = $2;
-        if (indent.level > module.trackedIndents[module.trackedIndents.length - 1]) {
+        const { level } = indent;
+        const currentIndent = module.indentLevels[module.indentLevels.length - 1];
+        if (level > currentIndent) {
           return $0;
         }
         return $skip;
@@ -4581,7 +4650,6 @@ var Civet = (() => {
           console.log("pushing indent", module.currentIndent);
         }
         module.indentLevels.push(module.currentIndent);
-        return module.currentIndent;
       });
       function PushIndent(state) {
         if (state.verbose)
@@ -4598,7 +4666,6 @@ var Civet = (() => {
         }
         module.indentLevels.pop();
         module.currentIndent = module.indentLevels[module.indentLevels.length - 1];
-        return module.currentIndent;
       });
       function PopIndent(state) {
         if (state.verbose)
@@ -4869,7 +4936,6 @@ var Civet = (() => {
           console.warn("No source map found in code");
           return codeWithSourceMap;
         }
-        debugger;
         composedLines = SourceMap.composeLines(upstreamMap.data.lines, parsed.lines);
         upstreamMap.data.lines = composedLines;
         remappedSourceMapJSON = upstreamMap.json(sourcePath, targetPath);