@danielx/civet 0.6.84 → 0.6.86

package/dist/browser.js

@@ -2121,7 +2121,7 @@ var Civet = (() => {
       ws = exp[0];
       exp = exp[1];
     }
-    if (!(exp.type === "StatementExpression")) {
+    if (!(exp?.type === "StatementExpression")) {
       return;
     }
     const pre = [];
@@ -2139,7 +2139,8 @@ var Civet = (() => {
         assignResults(blockStatement, (resultNode) => {
           return makeNode({
             type: "AssignmentExpression",
-            children: [ref, " = ", resultNode]
+            children: [ref, " = ", resultNode],
+            parent: statement2
           });
         });
         const refDec = {
@@ -2157,7 +2158,8 @@ var Civet = (() => {
       assignResults(blockStatement, (resultNode) => {
         return makeNode({
           type: "AssignmentExpression",
-          children: [ref, " = ", resultNode]
+          children: [ref, " = ", resultNode],
+          parent: statement
         });
       });
       const refDec = {
@@ -3140,6 +3142,7 @@ var Civet = (() => {
   __export(lib_exports, {
     addPostfixStatement: () => addPostfixStatement,
     adjustBindingElements: () => adjustBindingElements,
+    adjustIndexAccess: () => adjustIndexAccess,
     attachPostfixStatementAsExpression: () => attachPostfixStatementAsExpression,
     blockWithPrefix: () => blockWithPrefix,
     convertObjectToJSXAttributes: () => convertObjectToJSXAttributes,
@@ -3203,6 +3206,18 @@ var Civet = (() => {
     }
     return post;
   }
+  function adjustIndexAccess(dot) {
+    if (gatherRecursive(dot, (node) => node.token === "?").length) {
+      dot = [...dot, "["];
+    } else {
+      dot = replaceNodes(
+        deepCopy(dot),
+        (node) => node.token === ".",
+        (node) => ({ ...node, token: "[" })
+      );
+    }
+    return dot;
+  }
   function negateCondition(condition) {
     let { expression } = condition;
     const children = condition.children.slice();
@@ -3230,6 +3245,7 @@ var Civet = (() => {
       case "BlockStatement":
       case "DebuggerStatement":
       case "Declaration":
+      case "ForStatement":
       case "IfStatement":
       case "IterationStatement":
       case "ReturnStatement":
@@ -3908,6 +3924,40 @@ var Civet = (() => {
       return;
     });
   }
+  function processNegativeIndexAccess(statements) {
+    gatherRecursiveAll(statements, (n) => n.type === "NegativeIndex").forEach((exp) => {
+      const { parent } = exp;
+      const index = parent.children.indexOf(exp);
+      let ref, subexp;
+      if (index === 1) {
+        const child = parent.children[0];
+        ref = maybeRef(child);
+        if (ref !== child) {
+          subexp = parent.children.splice(0, 1);
+        }
+      } else if (index > 1) {
+        ref = makeRef();
+        subexp = parent.children.splice(0, index);
+      } else {
+        throw new Error("Invalid parse tree for negative index access");
+      }
+      if (subexp) {
+        exp.hoistDec = {
+          type: "Declaration",
+          children: ["let ", ref],
+          names: []
+        };
+        parent.children.unshift(makeLeftHandSideExpression({
+          type: "AssignmentExpression",
+          children: [ref, " = ", subexp]
+        }));
+      }
+      return exp.len.children = [
+        ref,
+        ".length"
+      ];
+    });
+  }
   function processProgram(root, config, m, ReservedWord) {
     assert.equal(m.forbidBracedApplication.length, 1, "forbidBracedApplication");
     assert.equal(m.forbidClassImplicitCall.length, 1, "forbidClassImplicitCall");
@@ -3917,6 +3967,7 @@ var Civet = (() => {
     assert.equal(m.JSXTagStack.length, 1, "JSXTagStack");
     addParentPointers(root);
     const { expressions: statements } = root;
+    processNegativeIndexAccess(statements);
     processTypes(statements);
     processDeclarationConditions(statements, m.getRef);
     processPipelineExpressions(statements);
@@ -5597,7 +5648,7 @@ ${input.slice(result.pos)}
       var $R13 = $R(new RegExp("(?=\\p{ID_Start}|[_$])", "suy"));
       var $R14 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
       var $R15 = $R(new RegExp("(?=\\[)", "suy"));
-      var $R16 = $R(new RegExp("[!+-]", "suy"));
+      var $R16 = $R(new RegExp("[!+-]?", "suy"));
       var $R17 = $R(new RegExp("[+-]", "suy"));
       var $R18 = $R(new RegExp("(?=\\p{ID_Start}|[_$^\xAB\xBB\u22D9\u2264\u2265\u2208\u220B\u2209\u220C\u2263\u2261\u2262\u2260=\u2016\u2047&|*\\/!?%<>\u29FA+-])", "suy"));
       var $R19 = $R(new RegExp("!\\^\\^?", "suy"));
@@ -5654,24 +5705,25 @@ ${input.slice(result.pos)}
       var $R70 = $R(new RegExp("\\s", "suy"));
       var $R71 = $R(new RegExp("(?=[<])", "suy"));
       var $R72 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-      var $R73 = $R(new RegExp("[\\s>]|\\/>", "suy"));
-      var $R74 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-      var $R75 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
-      var $R76 = $R(new RegExp("[<>]", "suy"));
-      var $R77 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
-      var $R78 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
-      var $R79 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-      var $R80 = $R(new RegExp("[+-]?", "suy"));
-      var $R81 = $R(new RegExp("(?=if|unless)", "suy"));
-      var $R82 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-      var $R83 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R84 = $R(new RegExp("[ \\t]*", "suy"));
-      var $R85 = $R(new RegExp("[\\s]*", "suy"));
-      var $R86 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-      var $R87 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-      var $R88 = $R(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
-      var $R89 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var $R90 = $R(new RegExp("[^]*", "suy"));
+      var $R73 = $R(new RegExp("[!+-]", "suy"));
+      var $R74 = $R(new RegExp("[\\s>]|\\/>", "suy"));
+      var $R75 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
+      var $R76 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
+      var $R77 = $R(new RegExp("[<>]", "suy"));
+      var $R78 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
+      var $R79 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
+      var $R80 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+      var $R81 = $R(new RegExp("[+-]?", "suy"));
+      var $R82 = $R(new RegExp("(?=if|unless)", "suy"));
+      var $R83 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+      var $R84 = $R(new RegExp("[\\t ]*", "suy"));
+      var $R85 = $R(new RegExp("[ \\t]*", "suy"));
+      var $R86 = $R(new RegExp("[\\s]*", "suy"));
+      var $R87 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+      var $R88 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
+      var $R89 = $R(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
+      var $R90 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var $R91 = $R(new RegExp("[^]*", "suy"));
       var Program$0 = $TS($S(Reset, Init, $E(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var statements = $4;
         processProgram({
@@ -6137,9 +6189,7 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "UnaryWithoutParenthesizedAssignmentBody", UnaryWithoutParenthesizedAssignmentBody$$);
       }
       var UnaryPostfix$0 = QuestionMark;
-      var UnaryPostfix$1 = $T($P(TypePostfix), function(value) {
-        return { "ts": true, "children": value };
-      });
+      var UnaryPostfix$1 = $P(TypePostfix);
       var UnaryPostfix$$ = [UnaryPostfix$0, UnaryPostfix$1];
       function UnaryPostfix(ctx, state) {
         return $EVENT_C(ctx, state, "UnaryPostfix", UnaryPostfix$$);
@@ -6147,7 +6197,7 @@ ${input.slice(result.pos)}
       var TypePostfix$0 = $TS($S(_, NWTypePostfix), function($skip, $loc, $0, $1, $2) {
         var ws = $1;
         var postfix = $2;
-        return [ws, ...postfix];
+        return [ws, postfix];
       });
       function TypePostfix(ctx, state) {
         return $EVENT(ctx, state, "TypePostfix", TypePostfix$0);
@@ -6162,18 +6212,26 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "Tuple", Tuple$0);
       }
       var NWTypePostfix$0 = $TS($S(As, _, Tuple), function($skip, $loc, $0, $1, $2, $3) {
-        return [{ $loc: $1.$loc, token: "satisfies" }, $2, $3];
+        return {
+          ts: true,
+          children: [{ $loc: $1.$loc, token: "satisfies" }, $2, $3]
+        };
       });
       var NWTypePostfix$1 = $TS($S(As, $E(ExclamationPoint), Type), function($skip, $loc, $0, $1, $2, $3) {
         var as = $1;
         var ex = $2;
         var type = $3;
+        let children;
         if (ex) {
-          return [{ $loc: ex.$loc, token: "as unknown " }, as, type];
+          children = [{ $loc: ex.$loc, token: "as unknown " }, as, type];
+        } else {
+          children = [as, type];
         }
-        return [as, type];
+        return { ts: true, children };
+      });
+      var NWTypePostfix$2 = $TS($S(Satisfies, Type), function($skip, $loc, $0, $1, $2) {
+        return { ts: true, children: $0 };
       });
-      var NWTypePostfix$2 = $S(Satisfies, Type);
       var NWTypePostfix$$ = [NWTypePostfix$0, NWTypePostfix$1, NWTypePostfix$2];
       function NWTypePostfix(ctx, state) {
         return $EVENT_C(ctx, state, "NWTypePostfix", NWTypePostfix$$);
@@ -7116,19 +7174,10 @@ ${input.slice(result.pos)}
       var PropertyAccess$0 = $TS($S(AccessStart, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
         var dot = $1;
         var literal = $2;
-        if (gatherRecursive(dot, (node) => node.token === "?").length) {
-          dot = [...dot, "["];
-        } else {
-          dot = replaceNodes(
-            deepCopy(dot),
-            (node) => node.token === ".",
-            (node) => ({ ...node, token: "[" })
-          );
-        }
         return {
           type: "Index",
           children: [
-            dot,
+            adjustIndexAccess(dot),
             literal,
             "]"
           ]
@@ -7138,11 +7187,20 @@ ${input.slice(result.pos)}
         var dot = $1;
         var neg = $2;
         var num = $3;
-        return [
-          { type: "PropertyAccess", children: [dot, "at"] },
-          // not including `name` so that `{x.-1}` doesn't use it
-          { type: "Call", children: ["(", neg, num, ")"] }
+        const len = {
+          children: []
+        }, children = [
+          adjustIndexAccess(dot),
+          len,
+          neg,
+          num,
+          "]"
         ];
+        return {
+          type: "NegativeIndex",
+          children,
+          len
+        };
       });
       var PropertyAccess$2 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier, LengthShorthand)), function($skip, $loc, $0, $1, $2, $3) {
         var access = $1;
@@ -9087,17 +9145,26 @@ ${input.slice(result.pos)}
           children: [ws, ...prop.children]
         };
       });
-      var PropertyDefinition$1 = $TS($S($E(_), $TEXT($EXPECT($R16, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyDefinition$1 = $TS($S($E(_), $TEXT($EXPECT($R16, "PropertyDefinition /[!+-]?/")), PropertyName, $Y(ObjectPropertyDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var ws = $1;
         var toggle = $2;
         var id = $3;
-        const value = toggle === "+" ? "true" : "false";
+        if (toggle) {
+          const value = toggle === "+" ? "true" : "false";
+          return {
+            type: "Property",
+            children: [ws, id, ": ", value],
+            name: id,
+            names: id.names,
+            value
+          };
+        }
         return {
           type: "Property",
-          children: [ws, id, ": ", value],
+          children: [ws, id],
           name: id,
           names: id.names,
-          value
+          value: id
         };
       });
       var PropertyDefinition$2 = $TS($S($E(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
@@ -12974,7 +13041,7 @@ ${input.slice(result.pos)}
           class: $2
         };
       });
-      var JSXAttribute$7 = $TS($S($TEXT($EXPECT($R16, "JSXAttribute /[!+-]/")), JSXAttributeName, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
+      var JSXAttribute$7 = $TS($S($TEXT($EXPECT($R73, "JSXAttribute /[!+-]/")), JSXAttributeName, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
         var toggle = $1;
         var id = $2;
         const value = toggle === "+" ? "true" : "false";
@@ -12984,11 +13051,11 @@ ${input.slice(result.pos)}
       function JSXAttribute(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttribute", JSXAttribute$$);
       }
-      var JSXAttributeSpace$0 = $R$0($EXPECT($R73, "JSXAttributeSpace /[\\s>]|\\/>/"));
+      var JSXAttributeSpace$0 = $R$0($EXPECT($R74, "JSXAttributeSpace /[\\s>]|\\/>/"));
       function JSXAttributeSpace(ctx, state) {
         return $EVENT(ctx, state, "JSXAttributeSpace", JSXAttributeSpace$0);
       }
-      var JSXShorthandString$0 = $TR($EXPECT($R74, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXShorthandString$0 = $TR($EXPECT($R75, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return quoteString($0);
       });
       var JSXShorthandString$1 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
@@ -13022,7 +13089,7 @@ ${input.slice(result.pos)}
         }
         return [open, value, close];
       });
-      var JSXAttributeValue$4 = $R$0($EXPECT($R75, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
+      var JSXAttributeValue$4 = $R$0($EXPECT($R76, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
       var JSXAttributeValue$$ = [JSXAttributeValue$0, JSXAttributeValue$1, JSXAttributeValue$2, JSXAttributeValue$3, JSXAttributeValue$4];
       function JSXAttributeValue(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttributeValue", JSXAttributeValue$$);
@@ -13035,7 +13102,7 @@ ${input.slice(result.pos)}
       function InlineJSXAttributeValue(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXAttributeValue", InlineJSXAttributeValue$0);
       }
-      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R76, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
+      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R77, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
         var op = $2;
         var rhs = $3;
         return [[], op, [], rhs];
@@ -13052,7 +13119,7 @@ ${input.slice(result.pos)}
       function InlineJSXUnaryExpression(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXUnaryExpression", InlineJSXUnaryExpression$0);
       }
-      var InlineJSXUnaryOp$0 = $TR($EXPECT($R77, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var InlineJSXUnaryOp$0 = $TR($EXPECT($R78, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function InlineJSXUnaryOp(ctx, state) {
@@ -13268,13 +13335,13 @@ ${input.slice(result.pos)}
       function JSXComment(ctx, state) {
         return $EVENT(ctx, state, "JSXComment", JSXComment$0);
       }
-      var JSXCommentContent$0 = $TR($EXPECT($R78, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXCommentContent$0 = $TR($EXPECT($R79, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0.replace(/\*\//g, "* /") };
       });
       function JSXCommentContent(ctx, state) {
         return $EVENT(ctx, state, "JSXCommentContent", JSXCommentContent$0);
       }
-      var JSXText$0 = $TR($EXPECT($R79, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXText$0 = $TR($EXPECT($R80, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "JSXText",
           token: $0,
@@ -13695,7 +13762,7 @@ ${input.slice(result.pos)}
       function TypeProperty(ctx, state) {
         return $EVENT(ctx, state, "TypeProperty", TypeProperty$0);
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R80, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R17, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R81, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R17, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
       function TypeIndexSignature(ctx, state) {
         return $EVENT(ctx, state, "TypeIndexSignature", TypeIndexSignature$0);
       }
@@ -13989,7 +14056,7 @@ ${input.slice(result.pos)}
       function NestedType(ctx, state) {
         return $EVENT(ctx, state, "NestedType", NestedType$0);
       }
-      var TypeConditional$0 = $TS($S($E(_), $EXPECT($R81, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
+      var TypeConditional$0 = $TS($S($E(_), $EXPECT($R82, "TypeConditional /(?=if|unless)/"), TypeIfThenElse), function($skip, $loc, $0, $1, $2, $3) {
         return [$1, expressionizeTypeIf($3)];
       });
       var TypeConditional$1 = $TS($S(TypeCondition, NotDedented, QuestionMark, Type, __, Colon, Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
@@ -14182,15 +14249,15 @@ ${input.slice(result.pos)}
       function ThisType(ctx, state) {
         return $EVENT(ctx, state, "ThisType", ThisType$0);
       }
-      var Shebang$0 = $S($R$0($EXPECT($R82, "Shebang /#![^\\r\\n]*/")), EOL);
+      var Shebang$0 = $S($R$0($EXPECT($R83, "Shebang /#![^\\r\\n]*/")), EOL);
       function Shebang(ctx, state) {
         return $EVENT(ctx, state, "Shebang", Shebang$0);
       }
-      var CivetPrologue$0 = $T($S($EXPECT($R83, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $EXPECT($R84, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
+      var CivetPrologue$0 = $T($S($EXPECT($R84, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $EXPECT($R85, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
         var content = value[2];
         return content;
       });
-      var CivetPrologue$1 = $T($S($EXPECT($R83, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $EXPECT($R84, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
+      var CivetPrologue$1 = $T($S($EXPECT($R84, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $EXPECT($R85, "CivetPrologue /[ \\t]*/"), $C(EOL, $Y(RestOfLine))), function(value) {
         var content = value[2];
         return content;
       });
@@ -14198,7 +14265,7 @@ ${input.slice(result.pos)}
       function CivetPrologue(ctx, state) {
         return $EVENT_C(ctx, state, "CivetPrologue", CivetPrologue$$);
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L225, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R85, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L225, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R86, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
         var options = $3;
         return {
           type: "CivetPrologue",
@@ -14209,7 +14276,7 @@ ${input.slice(result.pos)}
       function CivetPrologueContent(ctx, state) {
         return $EVENT(ctx, state, "CivetPrologueContent", CivetPrologueContent$0);
       }
-      var CivetOption$0 = $TR($EXPECT($R86, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CivetOption$0 = $TR($EXPECT($R87, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
           if (l)
             return l.toUpperCase();
@@ -14226,11 +14293,11 @@ ${input.slice(result.pos)}
       function CivetOption(ctx, state) {
         return $EVENT(ctx, state, "CivetOption", CivetOption$0);
       }
-      var UnknownPrologue$0 = $S($R$0($EXPECT($R83, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R84, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
       function UnknownPrologue(ctx, state) {
         return $EVENT(ctx, state, "UnknownPrologue", UnknownPrologue$0);
       }
-      var TripleSlashDirective$0 = $S($R$0($EXPECT($R87, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
+      var TripleSlashDirective$0 = $S($R$0($EXPECT($R88, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
       function TripleSlashDirective(ctx, state) {
         return $EVENT(ctx, state, "TripleSlashDirective", TripleSlashDirective$0);
       }
@@ -14246,13 +14313,13 @@ ${input.slice(result.pos)}
       function PrologueString(ctx, state) {
         return $EVENT_C(ctx, state, "PrologueString", PrologueString$$);
       }
-      var EOS$0 = $T($S($EXPECT($R88, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), $P(RestOfLine)), function(value) {
+      var EOS$0 = $T($S($EXPECT($R89, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), $P(RestOfLine)), function(value) {
         return value[1];
       });
       function EOS(ctx, state) {
         return $EVENT(ctx, state, "EOS", EOS$0);
       }
-      var EOL$0 = $TR($EXPECT($R89, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var EOL$0 = $TR($EXPECT($R90, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function EOL(ctx, state) {
@@ -14824,11 +14891,11 @@ ${input.slice(result.pos)}
       function Prologue(ctx, state) {
         return $EVENT(ctx, state, "Prologue", Prologue$0);
       }
-      var ProloguePrefix$0 = $S(Prologue, $R$0($EXPECT($R90, "ProloguePrefix /[^]*/")));
+      var ProloguePrefix$0 = $S(Prologue, $R$0($EXPECT($R91, "ProloguePrefix /[^]*/")));
       function ProloguePrefix(ctx, state) {
         return $EVENT(ctx, state, "ProloguePrefix", ProloguePrefix$0);
       }
-      var Indent$0 = $TR($EXPECT($R84, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Indent$0 = $TR($EXPECT($R85, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const level = getIndentLevel($0, module.config.tab);
         return {
           $loc,