@danielx/civet 0.4.8 → 0.4.9

package/dist/browser.js

@@ -589,9 +589,8 @@ var Civet = (() => {
         TripleDoubleStringCharacters,
         TripleSingleStringCharacters,
         CoffeeStringSubstitution,
-        CoffeeCompat,
-        CoffeeCompatDoubleQuotedString,
-        CoffeeCompatDoubleQuotedStringCharacters,
+        CoffeeInterpolatedDoubleQuotedString,
+        CoffeeDoubleQuotedStringCharacters,
         RegularExpressionLiteral,
         RegularExpressionBody,
         RegExpCharacter,
@@ -719,6 +718,10 @@ var Civet = (() => {
         TypeConstraint,
         TypeParameterDelimiter,
         Shebang,
+        CivetPrologue,
+        CivetPrologueContent,
+        CivetOption,
+        UnknownPrologue,
         DirectivePrologue,
         EOS,
         EOL,
@@ -735,6 +738,8 @@ var Civet = (() => {
         InsertSpace,
         InsertDot,
         InsertBreak,
+        CoffeeCommentEnabled,
+        CoffeeInterpolationEnabled,
         Reset,
         Init,
         Indent,
@@ -886,8 +891,9 @@ var Civet = (() => {
       var $L138 = $L("keyof");
       var $L139 = $L("infer");
       var $L140 = $L("[]");
-      var $L141 = $L("  ");
-      var $L142 = $L("	");
+      var $L141 = $L("civet");
+      var $L142 = $L("  ");
+      var $L143 = $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"));
@@ -924,8 +930,10 @@ var Civet = (() => {
       var $R33 = $R(new RegExp("[+-]", "suy"));
       var $R34 = $R(new RegExp("#![^\\r\\n]*", "suy"));
       var $R35 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R36 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var $R37 = $R(new RegExp("$", "suy"));
+      var $R36 = $R(new RegExp("[\\s]*", "suy"));
+      var $R37 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)", "suy"));
+      var $R38 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var $R39 = $R(new RegExp("$", "suy"));
       var Program$0 = $S(Reset, Init, __, $Q(TopLevelStatement), __);
       function Program(state) {
         if (state.verbose)
@@ -1186,7 +1194,7 @@ var Civet = (() => {
         var expOrBlock = $4;
         const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
         const isBlock = expOrBlock.type === "BlockStatement";
-        if (module.implicitReturns && !isVoid && isBlock) {
+        if (module.config.implicitReturns && !isVoid && isBlock) {
           module.addImplicitReturns(expOrBlock);
         }
         return {
@@ -1735,7 +1743,7 @@ var Civet = (() => {
         var suffix = $7;
         var block = $8;
         const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
-        if (module.implicitReturns && !isVoid) {
+        if (module.config.implicitReturns && !isVoid) {
           module.addImplicitReturns(block);
         }
         return {
@@ -1756,7 +1764,7 @@ var Civet = (() => {
         var arrow = $4;
         var block = $5;
         const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
-        if (module.implicitReturns && !isVoid) {
+        if (module.config.implicitReturns && !isVoid) {
           block = module.addImplicitReturns(block);
         }
         return {
@@ -2157,7 +2165,7 @@ var Civet = (() => {
         const isConstructor = sig.name === "constructor";
         const isVoid = sig.returnType === "void";
         const isSet = sig.modifier === "set";
-        if (module.implicitReturns && !isConstructor && !isSet && !isVoid) {
+        if (module.config.implicitReturns && !isConstructor && !isSet && !isVoid) {
           block = module.addImplicitReturns(block);
         }
         return $0;
@@ -2298,7 +2306,7 @@ var Civet = (() => {
       var BinaryOpSymbol$12 = $EXPECT($L53, fail, 'BinaryOpSymbol ">"');
       var BinaryOpSymbol$13 = $EXPECT($L54, fail, 'BinaryOpSymbol "!=="');
       var BinaryOpSymbol$14 = $TV($EXPECT($L55, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
-        if (module.coffeeCompat)
+        if (module.config.coffeeEq)
           return "!==";
         return $1;
       });
@@ -2307,7 +2315,7 @@ var Civet = (() => {
       });
       var BinaryOpSymbol$16 = $EXPECT($L57, fail, 'BinaryOpSymbol "==="');
       var BinaryOpSymbol$17 = $TV($EXPECT($L58, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
-        if (module.coffeeCompat)
+        if (module.config.coffeeEq)
           return "===";
         return $1;
       });
@@ -2428,7 +2436,10 @@ var Civet = (() => {
           return EmptyStatement$0(state);
         }
       }
-      var BlockStatement$0 = $S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace);
+      var BlockStatement$0 = $T($S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace), function(value) {
+        var exps = value[3];
+        return { "type": "BlockStatement", "children": value, "expressions": exps };
+      });
       function BlockStatement(state) {
         if (state.verbose)
           console.log("ENTER:", "BlockStatement");
@@ -3218,7 +3229,7 @@ var Civet = (() => {
         var e = $3;
         return [s, module.dedentBlockString(str), e];
       });
-      var StringLiteral$2 = CoffeeCompatDoubleQuotedString;
+      var StringLiteral$2 = CoffeeInterpolatedDoubleQuotedString;
       var StringLiteral$3 = BasicStringLiteral;
       function StringLiteral(state) {
         if (state.tokenize) {
@@ -3306,21 +3317,7 @@ var Civet = (() => {
           return CoffeeStringSubstitution$0(state);
         }
       }
-      var CoffeeCompat$0 = $TV($EXPECT($L1, fail, 'CoffeeCompat ""'), function($skip, $loc, $0, $1) {
-        if (module.coffeeCompat)
-          return;
-        return $skip;
-      });
-      function CoffeeCompat(state) {
-        if (state.verbose)
-          console.log("ENTER:", "CoffeeCompat");
-        if (state.tokenize) {
-          return $TOKEN("CoffeeCompat", state, CoffeeCompat$0(state));
-        } else {
-          return CoffeeCompat$0(state);
-        }
-      }
-      var CoffeeCompatDoubleQuotedString$0 = $TS($S(CoffeeCompat, DoubleQuote, $Q($C(CoffeeCompatDoubleQuotedStringCharacters, CoffeeStringSubstitution)), DoubleQuote), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CoffeeInterpolatedDoubleQuotedString$0 = $TS($S(CoffeeInterpolationEnabled, DoubleQuote, $Q($C(CoffeeDoubleQuotedStringCharacters, CoffeeStringSubstitution)), DoubleQuote), function($skip, $loc, $0, $1, $2, $3, $4) {
         var s = $2;
         var parts = $3;
         var e = $4;
@@ -3340,25 +3337,25 @@ var Civet = (() => {
         s.token = e.token = "`";
         return [s, parts, e];
       });
-      function CoffeeCompatDoubleQuotedString(state) {
+      function CoffeeInterpolatedDoubleQuotedString(state) {
         if (state.verbose)
-          console.log("ENTER:", "CoffeeCompatDoubleQuotedString");
+          console.log("ENTER:", "CoffeeInterpolatedDoubleQuotedString");
         if (state.tokenize) {
-          return $TOKEN("CoffeeCompatDoubleQuotedString", state, CoffeeCompatDoubleQuotedString$0(state));
+          return $TOKEN("CoffeeInterpolatedDoubleQuotedString", state, CoffeeInterpolatedDoubleQuotedString$0(state));
         } else {
-          return CoffeeCompatDoubleQuotedString$0(state);
+          return CoffeeInterpolatedDoubleQuotedString$0(state);
         }
       }
-      var CoffeeCompatDoubleQuotedStringCharacters$0 = $TR($EXPECT($R13, fail, 'CoffeeCompatDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CoffeeDoubleQuotedStringCharacters$0 = $TR($EXPECT($R13, fail, 'CoffeeDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
-      function CoffeeCompatDoubleQuotedStringCharacters(state) {
+      function CoffeeDoubleQuotedStringCharacters(state) {
         if (state.verbose)
-          console.log("ENTER:", "CoffeeCompatDoubleQuotedStringCharacters");
+          console.log("ENTER:", "CoffeeDoubleQuotedStringCharacters");
         if (state.tokenize) {
-          return $TOKEN("CoffeeCompatDoubleQuotedStringCharacters", state, CoffeeCompatDoubleQuotedStringCharacters$0(state));
+          return $TOKEN("CoffeeDoubleQuotedStringCharacters", state, CoffeeDoubleQuotedStringCharacters$0(state));
         } else {
-          return CoffeeCompatDoubleQuotedStringCharacters$0(state);
+          return CoffeeDoubleQuotedStringCharacters$0(state);
         }
       }
       var RegularExpressionLiteral$0 = $TV($TEXT($S($EXPECT($L44, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L44, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
@@ -3470,7 +3467,7 @@ var Civet = (() => {
       var SingleLineComment$0 = $TR($EXPECT($R20, fail, "SingleLineComment /\\/\\/[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
-      var SingleLineComment$1 = $S(CoffeeCompat, CoffeeSingleLineComment);
+      var SingleLineComment$1 = $S(CoffeeCommentEnabled, CoffeeSingleLineComment);
       function SingleLineComment(state) {
         if (state.tokenize) {
           return $TOKEN("SingleLineComment", state, SingleLineComment$0(state) || SingleLineComment$1(state));
@@ -4819,14 +4816,73 @@ var Civet = (() => {
           return Shebang$0(state);
         }
       }
-      var DirectivePrologue$0 = $Q($S($R$0($EXPECT($R35, fail, "DirectivePrologue /[\\t ]*/")), StringLiteral, $TEXT(StatementDelimiter), EOS));
-      function DirectivePrologue(state) {
+      var CivetPrologue$0 = $T($S($EXPECT($R35, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+        var content = value[2];
+        return content;
+      });
+      var CivetPrologue$1 = $T($S($EXPECT($R35, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+        var content = value[2];
+        return content;
+      });
+      function CivetPrologue(state) {
+        if (state.tokenize) {
+          return $TOKEN("CivetPrologue", state, CivetPrologue$0(state) || CivetPrologue$1(state));
+        } else {
+          return CivetPrologue$0(state) || CivetPrologue$1(state);
+        }
+      }
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L141, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R36, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+        var options = $2;
+        return {
+          type: "CivetPrologue",
+          children: [],
+          config: Object.fromEntries(options)
+        };
+      });
+      function CivetPrologueContent(state) {
         if (state.verbose)
-          console.log("ENTER:", "DirectivePrologue");
+          console.log("ENTER:", "CivetPrologueContent");
+        if (state.tokenize) {
+          return $TOKEN("CivetPrologueContent", state, CivetPrologueContent$0(state));
+        } else {
+          return CivetPrologueContent$0(state);
+        }
+      }
+      var CivetOption$0 = $TR($EXPECT($R37, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        const optionName = $2.toLowerCase().replace(/-+([a-z]?)/g, (_2, l) => {
+          if (l)
+            return l.toUpperCase();
+          return "";
+        });
+        const value = $1 === "-" ? false : true;
+        return [optionName, value];
+      });
+      function CivetOption(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CivetOption");
+        if (state.tokenize) {
+          return $TOKEN("CivetOption", state, CivetOption$0(state));
+        } else {
+          return CivetOption$0(state);
+        }
+      }
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R35, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
+      function UnknownPrologue(state) {
+        if (state.verbose)
+          console.log("ENTER:", "UnknownPrologue");
+        if (state.tokenize) {
+          return $TOKEN("UnknownPrologue", state, UnknownPrologue$0(state));
+        } else {
+          return UnknownPrologue$0(state);
+        }
+      }
+      var DirectivePrologue$0 = CivetPrologue;
+      var DirectivePrologue$1 = UnknownPrologue;
+      function DirectivePrologue(state) {
         if (state.tokenize) {
-          return $TOKEN("DirectivePrologue", state, DirectivePrologue$0(state));
+          return $TOKEN("DirectivePrologue", state, DirectivePrologue$0(state) || DirectivePrologue$1(state));
         } else {
-          return DirectivePrologue$0(state);
+          return DirectivePrologue$0(state) || DirectivePrologue$1(state);
         }
       }
       var EOS$0 = $P(RestOfLine);
@@ -4839,7 +4895,7 @@ var Civet = (() => {
           return EOS$0(state);
         }
       }
-      var EOL$0 = $R$0($EXPECT($R36, fail, "EOL /\\r\\n|\\n|\\r|$/"));
+      var EOL$0 = $R$0($EXPECT($R38, fail, "EOL /\\r\\n|\\n|\\r|$/"));
       function EOL(state) {
         if (state.verbose)
           console.log("ENTER:", "EOL");
@@ -4849,7 +4905,7 @@ var Civet = (() => {
           return EOL$0(state);
         }
       }
-      var EOF$0 = $R$0($EXPECT($R37, fail, "EOF /$/"));
+      var EOF$0 = $R$0($EXPECT($R39, fail, "EOF /$/"));
       function EOF(state) {
         if (state.verbose)
           console.log("ENTER:", "EOF");
@@ -5003,12 +5059,65 @@ var Civet = (() => {
           return InsertBreak$0(state);
         }
       }
+      var CoffeeCommentEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeCommentEnabled ""'), function($skip, $loc, $0, $1) {
+        if (module.config.coffeeComment)
+          return;
+        return $skip;
+      });
+      function CoffeeCommentEnabled(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeCommentEnabled");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeCommentEnabled", state, CoffeeCommentEnabled$0(state));
+        } else {
+          return CoffeeCommentEnabled$0(state);
+        }
+      }
+      var CoffeeInterpolationEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeInterpolationEnabled ""'), function($skip, $loc, $0, $1) {
+        if (module.config.coffeeInterpolation)
+          return;
+        return $skip;
+      });
+      function CoffeeInterpolationEnabled(state) {
+        if (state.verbose)
+          console.log("ENTER:", "CoffeeInterpolationEnabled");
+        if (state.tokenize) {
+          return $TOKEN("CoffeeInterpolationEnabled", state, CoffeeInterpolationEnabled$0(state));
+        } else {
+          return CoffeeInterpolationEnabled$0(state);
+        }
+      }
       var Reset$0 = $TV($EXPECT($L1, fail, 'Reset ""'), function($skip, $loc, $0, $1) {
         module.currentIndent = 0;
         module.indentLevels = [0];
         module.verbose = false;
-        module.coffeeCompat = false;
-        module.implicitReturns = true;
+        module.config = {
+          autoVar: false,
+          coffeeComment: false,
+          coffeeEq: false,
+          coffeeInterpolation: false,
+          implicitReturns: true
+        };
+        Object.defineProperty(module.config, "coffeeCompat", {
+          set(b) {
+            if (b) {
+              this.autoVar = true;
+              this.coffeeComment = true;
+              this.coffeeEq = true;
+              this.coffeeInterpolation = true;
+              this.implicitReturns = true;
+            } else {
+              this.autoVar = false;
+              this.coffeeComment = false;
+              this.coffeeEq = false;
+              this.coffeeInterpolation = false;
+              this.implicitReturns = false;
+            }
+          }
+        });
+        module.modifyString = function(str) {
+          return str.replace(/(?<!\\)(\\\\)*\n/g, "$1\\n");
+        };
       });
       function Reset(state) {
         if (state.verbose)
@@ -5019,12 +5128,13 @@ var Civet = (() => {
           return Reset$0(state);
         }
       }
-      var Init$0 = $TS($S($E(Shebang), DirectivePrologue, $EXPECT($L1, 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;
-        if (directives) {
-          const compatRe = /use coffee-compat/;
-          module.coffeeCompat = directives.some((d) => d[1].token?.match(compatRe));
-        }
+        directives.forEach((directive) => {
+          if (directive.type === "CivetPrologue") {
+            Object.assign(module.config, directive.config);
+          }
+        });
         function hasReturnStatement(node) {
           if (!node)
             return false;
@@ -5077,6 +5187,9 @@ var Civet = (() => {
             case "ThrowStatement":
             case "VariableDeclaration":
               return;
+            case "BlockStatement":
+              insertReturn(exp.expressions[exp.expressions.length - 1]);
+              return;
             case "IfStatement":
               insertReturn(exp.children[2]);
               if (exp.children[3])
@@ -5134,9 +5247,6 @@ var Civet = (() => {
           }
           return spacing;
         };
-        module.modifyString = function(str) {
-          return str.replace(/(?<!\\)(\\\\)*\n/g, "$1\\n");
-        };
         module.dedentBlockSubstitutions = function($02) {
           const [s, strWithSubstitutions, e] = $02;
           if (strWithSubstitutions.length === 0) {
@@ -5197,7 +5307,7 @@ var Civet = (() => {
           return Init$0(state);
         }
       }
-      var Indent$0 = $TV($Q($C($EXPECT($L141, fail, 'Indent "  "'), $EXPECT($L142, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
+      var Indent$0 = $TV($Q($C($EXPECT($L142, fail, 'Indent "  "'), $EXPECT($L143, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
         const level = $1.length;
         return {
           $loc,

package/dist/main.js

@@ -588,9 +588,8 @@ var require_parser = __commonJS({
       TripleDoubleStringCharacters,
       TripleSingleStringCharacters,
       CoffeeStringSubstitution,
-      CoffeeCompat,
-      CoffeeCompatDoubleQuotedString,
-      CoffeeCompatDoubleQuotedStringCharacters,
+      CoffeeInterpolatedDoubleQuotedString,
+      CoffeeDoubleQuotedStringCharacters,
       RegularExpressionLiteral,
       RegularExpressionBody,
       RegExpCharacter,
@@ -718,6 +717,10 @@ var require_parser = __commonJS({
       TypeConstraint,
       TypeParameterDelimiter,
       Shebang,
+      CivetPrologue,
+      CivetPrologueContent,
+      CivetOption,
+      UnknownPrologue,
       DirectivePrologue,
       EOS,
       EOL,
@@ -734,6 +737,8 @@ var require_parser = __commonJS({
       InsertSpace,
       InsertDot,
       InsertBreak,
+      CoffeeCommentEnabled,
+      CoffeeInterpolationEnabled,
       Reset,
       Init,
       Indent,
@@ -885,8 +890,9 @@ var require_parser = __commonJS({
     var $L138 = $L("keyof");
     var $L139 = $L("infer");
     var $L140 = $L("[]");
-    var $L141 = $L("  ");
-    var $L142 = $L("	");
+    var $L141 = $L("civet");
+    var $L142 = $L("  ");
+    var $L143 = $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"));
@@ -923,8 +929,10 @@ var require_parser = __commonJS({
     var $R33 = $R(new RegExp("[+-]", "suy"));
     var $R34 = $R(new RegExp("#![^\\r\\n]*", "suy"));
     var $R35 = $R(new RegExp("[\\t ]*", "suy"));
-    var $R36 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-    var $R37 = $R(new RegExp("$", "suy"));
+    var $R36 = $R(new RegExp("[\\s]*", "suy"));
+    var $R37 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)", "suy"));
+    var $R38 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+    var $R39 = $R(new RegExp("$", "suy"));
     var Program$0 = $S(Reset, Init, __, $Q(TopLevelStatement), __);
     function Program(state) {
       if (state.verbose)
@@ -1185,7 +1193,7 @@ var require_parser = __commonJS({
       var expOrBlock = $4;
       const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
       const isBlock = expOrBlock.type === "BlockStatement";
-      if (module2.implicitReturns && !isVoid && isBlock) {
+      if (module2.config.implicitReturns && !isVoid && isBlock) {
         module2.addImplicitReturns(expOrBlock);
       }
       return {
@@ -1734,7 +1742,7 @@ var require_parser = __commonJS({
       var suffix = $7;
       var block = $8;
       const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
-      if (module2.implicitReturns && !isVoid) {
+      if (module2.config.implicitReturns && !isVoid) {
         module2.addImplicitReturns(block);
       }
       return {
@@ -1755,7 +1763,7 @@ var require_parser = __commonJS({
       var arrow = $4;
       var block = $5;
       const isVoid = suffix?.children?.[1]?.[0]?.[1]?.token === "void";
-      if (module2.implicitReturns && !isVoid) {
+      if (module2.config.implicitReturns && !isVoid) {
         block = module2.addImplicitReturns(block);
       }
       return {
@@ -2156,7 +2164,7 @@ var require_parser = __commonJS({
       const isConstructor = sig.name === "constructor";
       const isVoid = sig.returnType === "void";
       const isSet = sig.modifier === "set";
-      if (module2.implicitReturns && !isConstructor && !isSet && !isVoid) {
+      if (module2.config.implicitReturns && !isConstructor && !isSet && !isVoid) {
         block = module2.addImplicitReturns(block);
       }
       return $0;
@@ -2297,7 +2305,7 @@ var require_parser = __commonJS({
     var BinaryOpSymbol$12 = $EXPECT($L53, fail, 'BinaryOpSymbol ">"');
     var BinaryOpSymbol$13 = $EXPECT($L54, fail, 'BinaryOpSymbol "!=="');
     var BinaryOpSymbol$14 = $TV($EXPECT($L55, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
-      if (module2.coffeeCompat)
+      if (module2.config.coffeeEq)
         return "!==";
       return $1;
     });
@@ -2306,7 +2314,7 @@ var require_parser = __commonJS({
     });
     var BinaryOpSymbol$16 = $EXPECT($L57, fail, 'BinaryOpSymbol "==="');
     var BinaryOpSymbol$17 = $TV($EXPECT($L58, fail, 'BinaryOpSymbol "=="'), function($skip, $loc, $0, $1) {
-      if (module2.coffeeCompat)
+      if (module2.config.coffeeEq)
         return "===";
       return $1;
     });
@@ -2427,7 +2435,10 @@ var require_parser = __commonJS({
         return EmptyStatement$0(state);
       }
     }
-    var BlockStatement$0 = $S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace);
+    var BlockStatement$0 = $T($S(__, OpenBrace, EOS, NestedBlockExpressions, __, CloseBrace), function(value) {
+      var exps = value[3];
+      return { "type": "BlockStatement", "children": value, "expressions": exps };
+    });
     function BlockStatement(state) {
       if (state.verbose)
         console.log("ENTER:", "BlockStatement");
@@ -3217,7 +3228,7 @@ var require_parser = __commonJS({
       var e = $3;
       return [s, module2.dedentBlockString(str), e];
     });
-    var StringLiteral$2 = CoffeeCompatDoubleQuotedString;
+    var StringLiteral$2 = CoffeeInterpolatedDoubleQuotedString;
     var StringLiteral$3 = BasicStringLiteral;
     function StringLiteral(state) {
       if (state.tokenize) {
@@ -3305,21 +3316,7 @@ var require_parser = __commonJS({
         return CoffeeStringSubstitution$0(state);
       }
     }
-    var CoffeeCompat$0 = $TV($EXPECT($L1, fail, 'CoffeeCompat ""'), function($skip, $loc, $0, $1) {
-      if (module2.coffeeCompat)
-        return;
-      return $skip;
-    });
-    function CoffeeCompat(state) {
-      if (state.verbose)
-        console.log("ENTER:", "CoffeeCompat");
-      if (state.tokenize) {
-        return $TOKEN("CoffeeCompat", state, CoffeeCompat$0(state));
-      } else {
-        return CoffeeCompat$0(state);
-      }
-    }
-    var CoffeeCompatDoubleQuotedString$0 = $TS($S(CoffeeCompat, DoubleQuote, $Q($C(CoffeeCompatDoubleQuotedStringCharacters, CoffeeStringSubstitution)), DoubleQuote), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CoffeeInterpolatedDoubleQuotedString$0 = $TS($S(CoffeeInterpolationEnabled, DoubleQuote, $Q($C(CoffeeDoubleQuotedStringCharacters, CoffeeStringSubstitution)), DoubleQuote), function($skip, $loc, $0, $1, $2, $3, $4) {
       var s = $2;
       var parts = $3;
       var e = $4;
@@ -3339,25 +3336,25 @@ var require_parser = __commonJS({
       s.token = e.token = "`";
       return [s, parts, e];
     });
-    function CoffeeCompatDoubleQuotedString(state) {
+    function CoffeeInterpolatedDoubleQuotedString(state) {
       if (state.verbose)
-        console.log("ENTER:", "CoffeeCompatDoubleQuotedString");
+        console.log("ENTER:", "CoffeeInterpolatedDoubleQuotedString");
       if (state.tokenize) {
-        return $TOKEN("CoffeeCompatDoubleQuotedString", state, CoffeeCompatDoubleQuotedString$0(state));
+        return $TOKEN("CoffeeInterpolatedDoubleQuotedString", state, CoffeeInterpolatedDoubleQuotedString$0(state));
       } else {
-        return CoffeeCompatDoubleQuotedString$0(state);
+        return CoffeeInterpolatedDoubleQuotedString$0(state);
       }
     }
-    var CoffeeCompatDoubleQuotedStringCharacters$0 = $TR($EXPECT($R13, fail, 'CoffeeCompatDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var CoffeeDoubleQuotedStringCharacters$0 = $TR($EXPECT($R13, fail, 'CoffeeDoubleQuotedStringCharacters /(?:\\\\.|#(?!\\{)|[^"#])+/'), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0 };
     });
-    function CoffeeCompatDoubleQuotedStringCharacters(state) {
+    function CoffeeDoubleQuotedStringCharacters(state) {
       if (state.verbose)
-        console.log("ENTER:", "CoffeeCompatDoubleQuotedStringCharacters");
+        console.log("ENTER:", "CoffeeDoubleQuotedStringCharacters");
       if (state.tokenize) {
-        return $TOKEN("CoffeeCompatDoubleQuotedStringCharacters", state, CoffeeCompatDoubleQuotedStringCharacters$0(state));
+        return $TOKEN("CoffeeDoubleQuotedStringCharacters", state, CoffeeDoubleQuotedStringCharacters$0(state));
       } else {
-        return CoffeeCompatDoubleQuotedStringCharacters$0(state);
+        return CoffeeDoubleQuotedStringCharacters$0(state);
       }
     }
     var RegularExpressionLiteral$0 = $TV($TEXT($S($EXPECT($L44, fail, 'RegularExpressionLiteral "/"'), RegularExpressionBody, $EXPECT($L44, fail, 'RegularExpressionLiteral "/"'), RegularExpressionFlags)), function($skip, $loc, $0, $1) {
@@ -3469,7 +3466,7 @@ var require_parser = __commonJS({
     var SingleLineComment$0 = $TR($EXPECT($R20, fail, "SingleLineComment /\\/\\/[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0 };
     });
-    var SingleLineComment$1 = $S(CoffeeCompat, CoffeeSingleLineComment);
+    var SingleLineComment$1 = $S(CoffeeCommentEnabled, CoffeeSingleLineComment);
     function SingleLineComment(state) {
       if (state.tokenize) {
         return $TOKEN("SingleLineComment", state, SingleLineComment$0(state) || SingleLineComment$1(state));
@@ -4818,14 +4815,73 @@ var require_parser = __commonJS({
         return Shebang$0(state);
       }
     }
-    var DirectivePrologue$0 = $Q($S($R$0($EXPECT($R35, fail, "DirectivePrologue /[\\t ]*/")), StringLiteral, $TEXT(StatementDelimiter), EOS));
-    function DirectivePrologue(state) {
+    var CivetPrologue$0 = $T($S($EXPECT($R35, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+      var content = value[2];
+      return content;
+    });
+    var CivetPrologue$1 = $T($S($EXPECT($R35, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+      var content = value[2];
+      return content;
+    });
+    function CivetPrologue(state) {
+      if (state.tokenize) {
+        return $TOKEN("CivetPrologue", state, CivetPrologue$0(state) || CivetPrologue$1(state));
+      } else {
+        return CivetPrologue$0(state) || CivetPrologue$1(state);
+      }
+    }
+    var CivetPrologueContent$0 = $TS($S($EXPECT($L141, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R36, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+      var options = $2;
+      return {
+        type: "CivetPrologue",
+        children: [],
+        config: Object.fromEntries(options)
+      };
+    });
+    function CivetPrologueContent(state) {
       if (state.verbose)
-        console.log("ENTER:", "DirectivePrologue");
+        console.log("ENTER:", "CivetPrologueContent");
+      if (state.tokenize) {
+        return $TOKEN("CivetPrologueContent", state, CivetPrologueContent$0(state));
+      } else {
+        return CivetPrologueContent$0(state);
+      }
+    }
+    var CivetOption$0 = $TR($EXPECT($R37, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      const optionName = $2.toLowerCase().replace(/-+([a-z]?)/g, (_2, l) => {
+        if (l)
+          return l.toUpperCase();
+        return "";
+      });
+      const value = $1 === "-" ? false : true;
+      return [optionName, value];
+    });
+    function CivetOption(state) {
+      if (state.verbose)
+        console.log("ENTER:", "CivetOption");
+      if (state.tokenize) {
+        return $TOKEN("CivetOption", state, CivetOption$0(state));
+      } else {
+        return CivetOption$0(state);
+      }
+    }
+    var UnknownPrologue$0 = $S($R$0($EXPECT($R35, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
+    function UnknownPrologue(state) {
+      if (state.verbose)
+        console.log("ENTER:", "UnknownPrologue");
+      if (state.tokenize) {
+        return $TOKEN("UnknownPrologue", state, UnknownPrologue$0(state));
+      } else {
+        return UnknownPrologue$0(state);
+      }
+    }
+    var DirectivePrologue$0 = CivetPrologue;
+    var DirectivePrologue$1 = UnknownPrologue;
+    function DirectivePrologue(state) {
       if (state.tokenize) {
-        return $TOKEN("DirectivePrologue", state, DirectivePrologue$0(state));
+        return $TOKEN("DirectivePrologue", state, DirectivePrologue$0(state) || DirectivePrologue$1(state));
       } else {
-        return DirectivePrologue$0(state);
+        return DirectivePrologue$0(state) || DirectivePrologue$1(state);
       }
     }
     var EOS$0 = $P(RestOfLine);
@@ -4838,7 +4894,7 @@ var require_parser = __commonJS({
         return EOS$0(state);
       }
     }
-    var EOL$0 = $R$0($EXPECT($R36, fail, "EOL /\\r\\n|\\n|\\r|$/"));
+    var EOL$0 = $R$0($EXPECT($R38, fail, "EOL /\\r\\n|\\n|\\r|$/"));
     function EOL(state) {
       if (state.verbose)
         console.log("ENTER:", "EOL");
@@ -4848,7 +4904,7 @@ var require_parser = __commonJS({
         return EOL$0(state);
       }
     }
-    var EOF$0 = $R$0($EXPECT($R37, fail, "EOF /$/"));
+    var EOF$0 = $R$0($EXPECT($R39, fail, "EOF /$/"));
     function EOF(state) {
       if (state.verbose)
         console.log("ENTER:", "EOF");
@@ -5002,12 +5058,65 @@ var require_parser = __commonJS({
         return InsertBreak$0(state);
       }
     }
+    var CoffeeCommentEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeCommentEnabled ""'), function($skip, $loc, $0, $1) {
+      if (module2.config.coffeeComment)
+        return;
+      return $skip;
+    });
+    function CoffeeCommentEnabled(state) {
+      if (state.verbose)
+        console.log("ENTER:", "CoffeeCommentEnabled");
+      if (state.tokenize) {
+        return $TOKEN("CoffeeCommentEnabled", state, CoffeeCommentEnabled$0(state));
+      } else {
+        return CoffeeCommentEnabled$0(state);
+      }
+    }
+    var CoffeeInterpolationEnabled$0 = $TV($EXPECT($L1, fail, 'CoffeeInterpolationEnabled ""'), function($skip, $loc, $0, $1) {
+      if (module2.config.coffeeInterpolation)
+        return;
+      return $skip;
+    });
+    function CoffeeInterpolationEnabled(state) {
+      if (state.verbose)
+        console.log("ENTER:", "CoffeeInterpolationEnabled");
+      if (state.tokenize) {
+        return $TOKEN("CoffeeInterpolationEnabled", state, CoffeeInterpolationEnabled$0(state));
+      } else {
+        return CoffeeInterpolationEnabled$0(state);
+      }
+    }
     var Reset$0 = $TV($EXPECT($L1, fail, 'Reset ""'), function($skip, $loc, $0, $1) {
       module2.currentIndent = 0;
       module2.indentLevels = [0];
       module2.verbose = false;
-      module2.coffeeCompat = false;
-      module2.implicitReturns = true;
+      module2.config = {
+        autoVar: false,
+        coffeeComment: false,
+        coffeeEq: false,
+        coffeeInterpolation: false,
+        implicitReturns: true
+      };
+      Object.defineProperty(module2.config, "coffeeCompat", {
+        set(b) {
+          if (b) {
+            this.autoVar = true;
+            this.coffeeComment = true;
+            this.coffeeEq = true;
+            this.coffeeInterpolation = true;
+            this.implicitReturns = true;
+          } else {
+            this.autoVar = false;
+            this.coffeeComment = false;
+            this.coffeeEq = false;
+            this.coffeeInterpolation = false;
+            this.implicitReturns = false;
+          }
+        }
+      });
+      module2.modifyString = function(str) {
+        return str.replace(/(?<!\\)(\\\\)*\n/g, "$1\\n");
+      };
     });
     function Reset(state) {
       if (state.verbose)
@@ -5018,12 +5127,13 @@ var require_parser = __commonJS({
         return Reset$0(state);
       }
     }
-    var Init$0 = $TS($S($E(Shebang), DirectivePrologue, $EXPECT($L1, 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;
-      if (directives) {
-        const compatRe = /use coffee-compat/;
-        module2.coffeeCompat = directives.some((d) => d[1].token?.match(compatRe));
-      }
+      directives.forEach((directive) => {
+        if (directive.type === "CivetPrologue") {
+          Object.assign(module2.config, directive.config);
+        }
+      });
       function hasReturnStatement(node) {
         if (!node)
           return false;
@@ -5076,6 +5186,9 @@ var require_parser = __commonJS({
           case "ThrowStatement":
           case "VariableDeclaration":
             return;
+          case "BlockStatement":
+            insertReturn(exp.expressions[exp.expressions.length - 1]);
+            return;
           case "IfStatement":
             insertReturn(exp.children[2]);
             if (exp.children[3])
@@ -5133,9 +5246,6 @@ var require_parser = __commonJS({
         }
         return spacing;
       };
-      module2.modifyString = function(str) {
-        return str.replace(/(?<!\\)(\\\\)*\n/g, "$1\\n");
-      };
       module2.dedentBlockSubstitutions = function($02) {
         const [s, strWithSubstitutions, e] = $02;
         if (strWithSubstitutions.length === 0) {
@@ -5196,7 +5306,7 @@ var require_parser = __commonJS({
         return Init$0(state);
       }
     }
-    var Indent$0 = $TV($Q($C($EXPECT($L141, fail, 'Indent "  "'), $EXPECT($L142, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
+    var Indent$0 = $TV($Q($C($EXPECT($L142, fail, 'Indent "  "'), $EXPECT($L143, fail, 'Indent "\\\\t"'))), function($skip, $loc, $0, $1) {
       const level = $1.length;
       return {
         $loc,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {