@danielx/civet 0.6.40 → 0.6.42

package/dist/browser.js

@@ -859,14 +859,36 @@ ${input.slice(result.pos)}
           })
         );
       }
+      function negateCondition(condition) {
+        let { expression } = condition;
+        const children = condition.children.slice();
+        const i = children.indexOf(expression);
+        if (i < 0) {
+          throw new Error(`Could not find expression in condition`);
+        }
+        children[i] = expression = {
+          type: "UnaryExpression",
+          children: [
+            "!",
+            makeLeftHandSideExpression(expression)
+          ]
+        };
+        return { ...condition, expression, children };
+      }
       function expressionizeIfClause(clause, b, e) {
-        const children = clause.children.slice(1);
-        children.push("?", b);
+        const { condition } = clause;
+        const [...condRest] = condition.children, [closeParen] = condRest.splice(-1);
+        const children = [
+          ...condRest,
+          "?",
+          b
+        ];
         if (e) {
           children.push(e[0], ":", ...e.slice(2));
         } else {
           children.push(":void 0");
         }
+        children.push(closeParen);
         return {
           type: "IfExpression",
           children
@@ -1550,7 +1572,6 @@ ${input.slice(result.pos)}
         const [, exp, semi] = node;
         if (semi?.type === "SemicolonDelimiter")
           return;
-        let indent = getIndent(node);
         if (!exp)
           return;
         switch (exp.type) {
@@ -1975,6 +1996,7 @@ ${input.slice(result.pos)}
           case "CallExpression":
           case "MemberExpression":
           case "ParenthesizedExpression":
+          case "IfExpression":
           case "DebuggerExpression":
           case "SwitchExpression":
           case "ThrowExpression":
@@ -2214,7 +2236,7 @@ ${input.slice(result.pos)}
           children
         };
       }
-      function processDeclarationCondition(condition) {
+      function processDeclarationCondition(condition, rootCondition) {
         if (!(condition.type === "DeclarationCondition")) {
           return;
         }
@@ -2222,7 +2244,7 @@ ${input.slice(result.pos)}
         const { decl, bindings } = condition.declaration;
         const binding = bindings[0];
         const { pattern, suffix, initializer, splices, thisAssignments } = binding;
-        const initCondition = {
+        Object.assign(condition, {
           type: "AssignmentExpression",
           children: [ref, initializer],
           hoistDec: {
@@ -2230,14 +2252,15 @@ ${input.slice(result.pos)}
             children: ["let ", ref, suffix],
             names: []
           },
+          pattern,
+          ref
+        });
+        Object.assign(rootCondition, {
           blockPrefix: [
             ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
             ...thisAssignments
-          ],
-          pattern,
-          ref
-        };
-        Object.assign(condition, initCondition);
+          ]
+        });
       }
       function processDeclarationConditions(node) {
         gatherRecursiveAll(node, (n) => {
@@ -2249,8 +2272,15 @@ ${input.slice(result.pos)}
         if (!condition?.expression) {
           return;
         }
-        processDeclarationCondition(condition.expression);
-        const { ref, pattern } = condition.expression;
+        ;
+        let { expression } = condition;
+        if (typeof expression === "object" && expression != null && "type" in expression && expression.type === "UnaryExpression" && "children" in expression && Array.isArray(expression.children) && expression.children.length === 2 && expression.children[0] === "!" && typeof expression.children[1] === "object" && expression.children[1] != null && "type" in expression.children[1] && expression.children[1].type === "ParenthesizedExpression" && "expression" in expression.children[1]) {
+          const { type: type1, children: [, { type: type2, expression: expression2 }] } = expression;
+          const type = [type1, type2];
+          expression = expression2;
+        }
+        processDeclarationCondition(expression, condition.expression);
+        const { ref, pattern } = expression;
         if (pattern) {
           let conditions = [];
           getPatternConditions(pattern, ref, conditions);
@@ -3542,6 +3572,7 @@ ${input.slice(result.pos)}
         maybeRef,
         modifyString,
         needsRef,
+        negateCondition,
         processAssignmentDeclaration,
         processBinaryOpExpression,
         processCallMemberExpression,
@@ -3984,6 +4015,7 @@ ${input.slice(result.pos)}
         TemplateBlockCharacters,
         ReservedWord,
         Comment,
+        _Comment,
         SingleLineComment,
         JSSingleLineComment,
         MultiLineComment,
@@ -4524,33 +4556,36 @@ ${input.slice(result.pos)}
       var $R38 = $R(new RegExp("(?:by)(?!\\p{ID_Continue})", "suy"));
       var $R39 = $R(new RegExp("(?:of)(?!\\p{ID_Continue})", "suy"));
       var $R40 = $R(new RegExp("(?:and|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|let|loop|new|not|null|or|private|protected|public|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
-      var $R41 = $R(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
-      var $R42 = $R(new RegExp(".", "suy"));
-      var $R43 = $R(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
-      var $R44 = $R(new RegExp("[^]*?###", "suy"));
-      var $R45 = $R(new RegExp("###(?!#)", "suy"));
-      var $R46 = $R(new RegExp("\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\/", "suy"));
-      var $R47 = $R(new RegExp("[ \\t]+", "suy"));
-      var $R48 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
-      var $R49 = $R(new RegExp("['\u2019]s", "suy"));
-      var $R50 = $R(new RegExp("\\s", "suy"));
-      var $R51 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-      var $R52 = $R(new RegExp("[\\s>]|\\/>", "suy"));
-      var $R53 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-      var $R54 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
-      var $R55 = $R(new RegExp("[<>]", "suy"));
-      var $R56 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
-      var $R57 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
-      var $R58 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-      var $R59 = $R(new RegExp("[+-]?", "suy"));
-      var $R60 = $R(new RegExp("[+-]", "suy"));
-      var $R61 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-      var $R62 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R63 = $R(new RegExp("[\\s]*", "suy"));
-      var $R64 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-      var $R65 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-      var $R66 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var $R67 = $R(new RegExp("[ \\t]*", "suy"));
+      var $R41 = $R(new RegExp("(?=\\/|#)", "suy"));
+      var $R42 = $R(new RegExp("\\/\\/(?!\\/)[^\\r\\n]*", "suy"));
+      var $R43 = $R(new RegExp(".", "suy"));
+      var $R44 = $R(new RegExp("#(?!##(?!#))([^\\r\\n]*)", "suy"));
+      var $R45 = $R(new RegExp("[^]*?###", "suy"));
+      var $R46 = $R(new RegExp("###(?!#)", "suy"));
+      var $R47 = $R(new RegExp("\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\/", "suy"));
+      var $R48 = $R(new RegExp("(?=[ \\t\\/])", "suy"));
+      var $R49 = $R(new RegExp("[ \\t]+", "suy"));
+      var $R50 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
+      var $R51 = $R(new RegExp("['\u2019]s", "suy"));
+      var $R52 = $R(new RegExp("\\s", "suy"));
+      var $R53 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
+      var $R54 = $R(new RegExp("[\\s>]|\\/>", "suy"));
+      var $R55 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
+      var $R56 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
+      var $R57 = $R(new RegExp("[<>]", "suy"));
+      var $R58 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
+      var $R59 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
+      var $R60 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+      var $R61 = $R(new RegExp("[+-]?", "suy"));
+      var $R62 = $R(new RegExp("[+-]", "suy"));
+      var $R63 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+      var $R64 = $R(new RegExp("[\\t ]*", "suy"));
+      var $R65 = $R(new RegExp("[\\s]*", "suy"));
+      var $R66 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+      var $R67 = $R(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
+      var $R68 = $R(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
+      var $R69 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var $R70 = $R(new RegExp("[ \\t]*", "suy"));
       var Program$0 = $TS($S(Reset, Init, $E(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var statements = $4;
         processProgram({
@@ -5957,8 +5992,8 @@ ${input.slice(result.pos)}
       function NonEmptyParameters(ctx, state) {
         return $EVENT(ctx, state, "NonEmptyParameters", NonEmptyParameters$0);
       }
-      var FunctionRestParameter$0 = $TS($S(BindingRestElement, $E(TypeSuffix), ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3) {
-        var id = $1;
+      var FunctionRestParameter$0 = $TS($S(__, BindingRestElement, $E(TypeSuffix), ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var id = $2;
         return {
           type: "FunctionRestParameter",
           children: $0,
@@ -8321,10 +8356,10 @@ ${input.slice(result.pos)}
         kind = { ...kind, token: "if" };
         kind.token += getTrimmingSpace(condition);
         condition = insertTrimmingSpace(condition, "");
+        condition = negateCondition(condition);
         return {
           type: "IfStatement",
-          // TODO: Don't add unnecessary parens
-          children: [kind, ["(!", condition, ")"]],
+          children: [kind, condition],
           condition
         };
       });
@@ -8527,16 +8562,12 @@ ${input.slice(result.pos)}
         var ws = $2;
         var condition = $3;
         if (kind.token === "until") {
-          kind.token = "while";
-          return {
-            type: "IterationStatement",
-            children: [kind, ...ws, ["(!", ...condition.children, ")"]],
-            condition
-          };
+          kind = { ...kind, token: "while" };
+          condition = negateCondition(condition);
         }
         return {
           type: "IterationStatement",
-          children: [kind, ...ws, ...condition.children],
+          children: [kind, ws, condition],
           condition
         };
       });
@@ -10077,11 +10108,17 @@ ${input.slice(result.pos)}
       function ReservedWord(ctx, state) {
         return $EVENT_C(ctx, state, "ReservedWord", ReservedWord$$);
       }
-      var Comment$0 = MultiLineComment;
-      var Comment$1 = SingleLineComment;
-      var Comment$$ = [Comment$0, Comment$1];
+      var Comment$0 = $T($S($EXPECT($R41, "Comment /(?=\\/|#)/"), _Comment), function(value) {
+        return value[1];
+      });
       function Comment(ctx, state) {
-        return $EVENT_C(ctx, state, "Comment", Comment$$);
+        return $EVENT(ctx, state, "Comment", Comment$0);
+      }
+      var _Comment$0 = MultiLineComment;
+      var _Comment$1 = SingleLineComment;
+      var _Comment$$ = [_Comment$0, _Comment$1];
+      function _Comment(ctx, state) {
+        return $EVENT_C(ctx, state, "_Comment", _Comment$$);
       }
       var SingleLineComment$0 = JSSingleLineComment;
       var SingleLineComment$1 = $S(CoffeeCommentEnabled, CoffeeSingleLineComment);
@@ -10089,7 +10126,7 @@ ${input.slice(result.pos)}
       function SingleLineComment(ctx, state) {
         return $EVENT_C(ctx, state, "SingleLineComment", SingleLineComment$$);
       }
-      var JSSingleLineComment$0 = $TR($EXPECT($R41, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSSingleLineComment$0 = $TR($EXPECT($R42, "JSSingleLineComment /\\/\\/(?!\\/)[^\\r\\n]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { type: "Comment", $loc, token: $0 };
       });
       function JSSingleLineComment(ctx, state) {
@@ -10101,30 +10138,30 @@ ${input.slice(result.pos)}
       function MultiLineComment(ctx, state) {
         return $EVENT_C(ctx, state, "MultiLineComment", MultiLineComment$$);
       }
-      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L109, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L110, 'JSMultiLineComment "*/"')), $EXPECT($R42, "JSMultiLineComment /./"))), $EXPECT($L110, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
+      var JSMultiLineComment$0 = $TV($TEXT($S($EXPECT($L109, 'JSMultiLineComment "/*"'), $Q($S($N($EXPECT($L110, 'JSMultiLineComment "*/"')), $EXPECT($R43, "JSMultiLineComment /./"))), $EXPECT($L110, 'JSMultiLineComment "*/"'))), function($skip, $loc, $0, $1) {
         return { type: "Comment", $loc, token: $1 };
       });
       function JSMultiLineComment(ctx, state) {
         return $EVENT(ctx, state, "JSMultiLineComment", JSMultiLineComment$0);
       }
-      var CoffeeSingleLineComment$0 = $TR($EXPECT($R43, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CoffeeSingleLineComment$0 = $TR($EXPECT($R44, "CoffeeSingleLineComment /#(?!##(?!#))([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { type: "Comment", $loc, token: `//${$1}` };
       });
       function CoffeeSingleLineComment(ctx, state) {
         return $EVENT(ctx, state, "CoffeeSingleLineComment", CoffeeSingleLineComment$0);
       }
-      var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($EXPECT($R44, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
+      var CoffeeMultiLineComment$0 = $TS($S(CoffeeHereCommentStart, $TEXT($EXPECT($R45, "CoffeeMultiLineComment /[^]*?###/"))), function($skip, $loc, $0, $1, $2) {
         $2 = $2.slice(0, $2.length - 3).replace(/\*\//g, "* /");
         return { type: "Comment", $loc, token: `/*${$2}*/` };
       });
       function CoffeeMultiLineComment(ctx, state) {
         return $EVENT(ctx, state, "CoffeeMultiLineComment", CoffeeMultiLineComment$0);
       }
-      var CoffeeHereCommentStart$0 = $R$0($EXPECT($R45, "CoffeeHereCommentStart /###(?!#)/"));
+      var CoffeeHereCommentStart$0 = $R$0($EXPECT($R46, "CoffeeHereCommentStart /###(?!#)/"));
       function CoffeeHereCommentStart(ctx, state) {
         return $EVENT(ctx, state, "CoffeeHereCommentStart", CoffeeHereCommentStart$0);
       }
-      var InlineComment$0 = $TR($EXPECT($R46, "InlineComment /\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\//"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var InlineComment$0 = $TR($EXPECT($R47, "InlineComment /\\/\\*(?:(?!\\*\\/)[^\\r\\n])*\\*\\//"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function InlineComment(ctx, state) {
@@ -10138,11 +10175,13 @@ ${input.slice(result.pos)}
       function TrailingComment(ctx, state) {
         return $EVENT(ctx, state, "TrailingComment", TrailingComment$0);
       }
-      var _$0 = $P($C(NonNewlineWhitespace, InlineComment));
+      var _$0 = $T($S($EXPECT($R48, "_ /(?=[ \\t\\/])/"), $P($C(NonNewlineWhitespace, InlineComment))), function(value) {
+        return value[1];
+      });
       function _(ctx, state) {
         return $EVENT(ctx, state, "_", _$0);
       }
-      var NonNewlineWhitespace$0 = $TR($EXPECT($R47, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var NonNewlineWhitespace$0 = $TR($EXPECT($R49, "NonNewlineWhitespace /[ \\t]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       var NonNewlineWhitespace$1 = $T($S(CoffeeLineContinuationEnabled, $EXPECT($L111, 'NonNewlineWhitespace "\\\\\\\\"'), EOL), function(value) {
@@ -10202,7 +10241,7 @@ ${input.slice(result.pos)}
       function SemicolonDelimiter(ctx, state) {
         return $EVENT(ctx, state, "SemicolonDelimiter", SemicolonDelimiter$0);
       }
-      var NonIdContinue$0 = $R$0($EXPECT($R48, "NonIdContinue /(?!\\p{ID_Continue})/"));
+      var NonIdContinue$0 = $R$0($EXPECT($R50, "NonIdContinue /(?!\\p{ID_Continue})/"));
       function NonIdContinue(ctx, state) {
         return $EVENT(ctx, state, "NonIdContinue", NonIdContinue$0);
       }
@@ -10353,7 +10392,7 @@ ${input.slice(result.pos)}
       var Dot$0 = $TV($EXPECT($L6, 'Dot "."'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
-      var Dot$1 = $TS($S($EXPECT($R49, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
+      var Dot$1 = $TS($S($EXPECT($R51, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
         var ws = $2;
         return [
           { $loc, token: "." },
@@ -10468,7 +10507,7 @@ ${input.slice(result.pos)}
       function If(ctx, state) {
         return $EVENT(ctx, state, "If", If$0);
       }
-      var Import$0 = $TS($S($EXPECT($L15, 'Import "import"'), $Y($EXPECT($R50, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+      var Import$0 = $TS($S($EXPECT($L15, 'Import "import"'), $Y($EXPECT($R52, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function Import(ctx, state) {
@@ -10937,7 +10976,7 @@ ${input.slice(result.pos)}
       function JSXElementName(ctx, state) {
         return $EVENT_C(ctx, state, "JSXElementName", JSXElementName$$);
       }
-      var JSXIdentifierName$0 = $R$0($EXPECT($R51, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
+      var JSXIdentifierName$0 = $R$0($EXPECT($R53, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
       function JSXIdentifierName(ctx, state) {
         return $EVENT(ctx, state, "JSXIdentifierName", JSXIdentifierName$0);
       }
@@ -11120,11 +11159,11 @@ ${input.slice(result.pos)}
       function JSXAttribute(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttribute", JSXAttribute$$);
       }
-      var JSXAttributeSpace$0 = $R$0($EXPECT($R52, "JSXAttributeSpace /[\\s>]|\\/>/"));
+      var JSXAttributeSpace$0 = $R$0($EXPECT($R54, "JSXAttributeSpace /[\\s>]|\\/>/"));
       function JSXAttributeSpace(ctx, state) {
         return $EVENT(ctx, state, "JSXAttributeSpace", JSXAttributeSpace$0);
       }
-      var JSXShorthandString$0 = $TR($EXPECT($R53, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXShorthandString$0 = $TR($EXPECT($R55, "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) {
@@ -11158,7 +11197,7 @@ ${input.slice(result.pos)}
         }
         return [open, value, close];
       });
-      var JSXAttributeValue$4 = $R$0($EXPECT($R54, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
+      var JSXAttributeValue$4 = $R$0($EXPECT($R56, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
       var JSXAttributeValue$$ = [JSXAttributeValue$0, JSXAttributeValue$1, JSXAttributeValue$2, JSXAttributeValue$3, JSXAttributeValue$4];
       function JSXAttributeValue(ctx, state) {
         return $EVENT_C(ctx, state, "JSXAttributeValue", JSXAttributeValue$$);
@@ -11171,7 +11210,7 @@ ${input.slice(result.pos)}
       function InlineJSXAttributeValue(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXAttributeValue", InlineJSXAttributeValue$0);
       }
-      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R55, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
+      var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R57, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
         var op = $2;
         var rhs = $3;
         return [[], op, [], rhs];
@@ -11188,7 +11227,7 @@ ${input.slice(result.pos)}
       function InlineJSXUnaryExpression(ctx, state) {
         return $EVENT(ctx, state, "InlineJSXUnaryExpression", InlineJSXUnaryExpression$0);
       }
-      var InlineJSXUnaryOp$0 = $TR($EXPECT($R56, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var InlineJSXUnaryOp$0 = $TR($EXPECT($R58, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function InlineJSXUnaryOp(ctx, state) {
@@ -11400,13 +11439,13 @@ ${input.slice(result.pos)}
       function JSXComment(ctx, state) {
         return $EVENT(ctx, state, "JSXComment", JSXComment$0);
       }
-      var JSXCommentContent$0 = $TR($EXPECT($R57, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXCommentContent$0 = $TR($EXPECT($R59, "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($R58, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXText$0 = $TR($EXPECT($R60, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "JSXText",
           token: $0,
@@ -11771,7 +11810,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($R59, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R60, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R61, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R62, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
       function TypeIndexSignature(ctx, state) {
         return $EVENT(ctx, state, "TypeIndexSignature", TypeIndexSignature$0);
       }
@@ -12130,15 +12169,15 @@ ${input.slice(result.pos)}
       function ThisType(ctx, state) {
         return $EVENT(ctx, state, "ThisType", ThisType$0);
       }
-      var Shebang$0 = $S($R$0($EXPECT($R61, "Shebang /#![^\\r\\n]*/")), EOL);
+      var Shebang$0 = $S($R$0($EXPECT($R63, "Shebang /#![^\\r\\n]*/")), EOL);
       function Shebang(ctx, state) {
         return $EVENT(ctx, state, "Shebang", Shebang$0);
       }
-      var CivetPrologue$0 = $T($S($EXPECT($R62, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
+      var CivetPrologue$0 = $T($S($EXPECT($R64, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
         var content = value[2];
         return content;
       });
-      var CivetPrologue$1 = $T($S($EXPECT($R62, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
+      var CivetPrologue$1 = $T($S($EXPECT($R64, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, $E(EOS)), function(value) {
         var content = value[2];
         return content;
       });
@@ -12146,7 +12185,7 @@ ${input.slice(result.pos)}
       function CivetPrologue(ctx, state) {
         return $EVENT_C(ctx, state, "CivetPrologue", CivetPrologue$$);
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L210, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L210, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R65, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
         var options = $3;
         return {
           type: "CivetPrologue",
@@ -12157,7 +12196,7 @@ ${input.slice(result.pos)}
       function CivetPrologueContent(ctx, state) {
         return $EVENT(ctx, state, "CivetPrologueContent", CivetPrologueContent$0);
       }
-      var CivetOption$0 = $TR($EXPECT($R64, "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($R66, "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();
@@ -12174,11 +12213,11 @@ ${input.slice(result.pos)}
       function CivetOption(ctx, state) {
         return $EVENT(ctx, state, "CivetOption", CivetOption$0);
       }
-      var UnknownPrologue$0 = $S($R$0($EXPECT($R62, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R64, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
       function UnknownPrologue(ctx, state) {
         return $EVENT(ctx, state, "UnknownPrologue", UnknownPrologue$0);
       }
-      var TripleSlashDirective$0 = $S($R$0($EXPECT($R65, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
+      var TripleSlashDirective$0 = $S($R$0($EXPECT($R67, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), $E(EOS));
       function TripleSlashDirective(ctx, state) {
         return $EVENT(ctx, state, "TripleSlashDirective", TripleSlashDirective$0);
       }
@@ -12192,11 +12231,13 @@ ${input.slice(result.pos)}
       function PrologueString(ctx, state) {
         return $EVENT_C(ctx, state, "PrologueString", PrologueString$$);
       }
-      var EOS$0 = $P(RestOfLine);
+      var EOS$0 = $T($S($EXPECT($R68, "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($R66, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var EOL$0 = $TR($EXPECT($R69, "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) {
@@ -12690,7 +12731,7 @@ ${input.slice(result.pos)}
       function Init(ctx, state) {
         return $EVENT(ctx, state, "Init", Init$0);
       }
-      var Indent$0 = $TR($EXPECT($R67, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Indent$0 = $TR($EXPECT($R70, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const level = getIndentLevel($0, module.config.tab);
         return {
           $loc,
@@ -13190,6 +13231,7 @@ ${input.slice(result.pos)}
       exports.TemplateBlockCharacters = TemplateBlockCharacters;
       exports.ReservedWord = ReservedWord;
       exports.Comment = Comment;
+      exports._Comment = _Comment;
       exports.SingleLineComment = SingleLineComment;
       exports.JSSingleLineComment = JSSingleLineComment;
       exports.MultiLineComment = MultiLineComment;
@@ -13504,6 +13546,7 @@ ${input.slice(result.pos)}
         makeRef,
         maybeRef,
         modifyString,
+        negateCondition,
         processAssignmentDeclaration,
         processBinaryOpExpression,
         processCallMemberExpression,

package/dist/civet

@@ -42,39 +42,39 @@ if (process.argv.includes("--version")) {
   process.exit(0);
 }
 if (process.argv.includes("--help")) {
-  process.stderr.write(`\u2584\u2584\xB7 \u25AA   \u258C \u2590\xB7\u2584\u2584\u2584 .\u2584\u2584\u2584\u2584\u2584
-          \u2590\u2588 \u258C\u25AA\u2588\u2588 \u25AA\u2588\xB7\u2588\u258C\u2580\u2584.\u2580\xB7\u2022\u2588\u2588       _._     _,-'""\`-._
-          \u2588\u2588 \u2584\u2584\u2590\u2588\xB7\u2590\u2588\u2590\u2588\u2022\u2590\u2580\u2580\u25AA\u2584 \u2590\u2588.\u25AA    (,-.\`._,'(       |\\\`-/|
-          \u2590\u2588\u2588\u2588\u258C\u2590\u2588\u258C \u2588\u2588\u2588 \u2590\u2588\u2584\u2584\u258C \u2590\u2588\u258C\xB7        \`-.-' \\ )-\`( , o o)
-          \xB7\u2580\u2580\u2580 \u2580\u2580\u2580. \u2580   \u2580\u2580\u2580  \u2580\u2580\u2580               \`-    \\\`_\`"'-
+  process.stderr.write(`       \u2584\u2584\xB7 \u25AA   \u258C \u2590\xB7\u2584\u2584\u2584 .\u2584\u2584\u2584\u2584\u2584
+      \u2590\u2588 \u258C\u25AA\u2588\u2588 \u25AA\u2588\xB7\u2588\u258C\u2580\u2584.\u2580\xB7\u2022\u2588\u2588       _._     _,-'""\`-._
+      \u2588\u2588 \u2584\u2584\u2590\u2588\xB7\u2590\u2588\u2590\u2588\u2022\u2590\u2580\u2580\u25AA\u2584 \u2590\u2588.\u25AA    (,-.\`._,'(       |\\\`-/|
+      \u2590\u2588\u2588\u2588\u258C\u2590\u2588\u258C \u2588\u2588\u2588 \u2590\u2588\u2584\u2584\u258C \u2590\u2588\u258C\xB7        \`-.-' \\ )-\`( , o o)
+      \xB7\u2580\u2580\u2580 \u2580\u2580\u2580. \u2580   \u2580\u2580\u2580  \u2580\u2580\u2580               \`-    \\\`_\`"'-
 
 
-    Usage:
+Usage:
 
-        civet                                        # REPL for executing code
-        civet -c                                     # REPL for transpiling code
-        civet --ast                                  # REPL for parsing code
-        civet [options] input.civet                  # run input.civet
-        civet [options] -c input.civet               # -> input.civet.tsx
-        civet [options] -c input.civet -o .ts        # -> input.ts
-        civet [options] -c input.civet -o dir        # -> dir/input.civet.tsx
-        civet [options] -c input.civet -o dir/.ts    # -> dir/input.ts
-        civet [options] -c input.civet -o output.ts  # -> output.ts
-        civet [options] < input.civet > output.ts    # pipe form
+    civet                                        # REPL for executing code
+    civet -c                                     # REPL for transpiling code
+    civet --ast                                  # REPL for parsing code
+    civet [options] input.civet                  # run input.civet
+    civet [options] -c input.civet               # -> input.civet.tsx
+    civet [options] -c input.civet -o .ts        # -> input.ts
+    civet [options] -c input.civet -o dir        # -> dir/input.civet.tsx
+    civet [options] -c input.civet -o dir/.ts    # -> dir/input.ts
+    civet [options] -c input.civet -o output.ts  # -> output.ts
+    civet [options] < input.civet > output.ts    # pipe form
 
-    Options:
-      --help           Show this help message
-      --version        Show the version number
-      -o / --output XX Specify output directory and/or extension, or filename
-      -c / --compile   Compile input files to TypeScript (or JavaScript)
-      --config XX      Specify a config file (default scans for a config.civet, civet.json, civetconfig.civet or civetconfig.json file, optionally in a .config directory, or starting with a .)
-      --no-config      Don't scan for a config file
-      --js             Strip out all type annotations; default to .jsx extension
-      --ast            Print the AST instead of the compiled code
-      --inline-map     Generate a sourcemap
-      --no-cache       Disable compiler caching (slow, for debugging)
+Options:
+  --help           Show this help message
+  --version        Show the version number
+  -o / --output XX Specify output directory and/or extension, or filename
+  -c / --compile   Compile input files to TypeScript (or JavaScript)
+  --config XX      Specify a config file (default scans for a config.civet, civet.json, civetconfig.civet or civetconfig.json file, optionally in a .config directory, or starting with a .)
+  --no-config      Don't scan for a config file
+  --js             Strip out all type annotations; default to .jsx extension
+  --ast            Print the AST instead of the compiled code
+  --inline-map     Generate a sourcemap
+  --no-cache       Disable compiler caching (slow, for debugging)
 
-    You can use - to read from stdin or (prefixed by -o) write to stdout.
+You can use - to read from stdin or (prefixed by -o) write to stdout.
 
 `);
   process.exit(0);