@danielx/civet 0.6.40 → 0.6.42

package/dist/main.mjs

@@ -849,14 +849,36 @@ var require_lib = __commonJS({
         })
       );
     }
+    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
@@ -1540,7 +1562,6 @@ var require_lib = __commonJS({
       const [, exp, semi] = node;
       if (semi?.type === "SemicolonDelimiter")
         return;
-      let indent = getIndent(node);
       if (!exp)
         return;
       switch (exp.type) {
@@ -1965,6 +1986,7 @@ var require_lib = __commonJS({
         case "CallExpression":
         case "MemberExpression":
         case "ParenthesizedExpression":
+        case "IfExpression":
         case "DebuggerExpression":
         case "SwitchExpression":
         case "ThrowExpression":
@@ -2204,7 +2226,7 @@ var require_lib = __commonJS({
         children
       };
     }
-    function processDeclarationCondition(condition) {
+    function processDeclarationCondition(condition, rootCondition) {
       if (!(condition.type === "DeclarationCondition")) {
         return;
       }
@@ -2212,7 +2234,7 @@ var require_lib = __commonJS({
       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: {
@@ -2220,14 +2242,15 @@ var require_lib = __commonJS({
           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) => {
@@ -2239,8 +2262,15 @@ var require_lib = __commonJS({
       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);
@@ -3532,6 +3562,7 @@ var require_lib = __commonJS({
       maybeRef,
       modifyString,
       needsRef,
+      negateCondition,
       processAssignmentDeclaration,
       processBinaryOpExpression,
       processCallMemberExpression,
@@ -3974,6 +4005,7 @@ var require_parser = __commonJS({
       TemplateBlockCharacters,
       ReservedWord,
       Comment,
+      _Comment,
       SingleLineComment,
       JSSingleLineComment,
       MultiLineComment,
@@ -4514,33 +4546,36 @@ var require_parser = __commonJS({
     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({
@@ -5947,8 +5982,8 @@ var require_parser = __commonJS({
     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,
@@ -8311,10 +8346,10 @@ var require_parser = __commonJS({
       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
       };
     });
@@ -8517,16 +8552,12 @@ var require_parser = __commonJS({
       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
       };
     });
@@ -10067,11 +10098,17 @@ var require_parser = __commonJS({
     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);
@@ -10079,7 +10116,7 @@ var require_parser = __commonJS({
     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) {
@@ -10091,30 +10128,30 @@ var require_parser = __commonJS({
     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) {
@@ -10128,11 +10165,13 @@ var require_parser = __commonJS({
     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) {
@@ -10192,7 +10231,7 @@ var require_parser = __commonJS({
     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);
     }
@@ -10343,7 +10382,7 @@ var require_parser = __commonJS({
     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: "." },
@@ -10458,7 +10497,7 @@ var require_parser = __commonJS({
     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) {
@@ -10927,7 +10966,7 @@ var require_parser = __commonJS({
     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);
     }
@@ -11110,11 +11149,11 @@ var require_parser = __commonJS({
     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) {
@@ -11148,7 +11187,7 @@ var require_parser = __commonJS({
       }
       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$$);
@@ -11161,7 +11200,7 @@ var require_parser = __commonJS({
     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];
@@ -11178,7 +11217,7 @@ var require_parser = __commonJS({
     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) {
@@ -11390,13 +11429,13 @@ var require_parser = __commonJS({
     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,
@@ -11761,7 +11800,7 @@ var require_parser = __commonJS({
     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);
     }
@@ -12120,15 +12159,15 @@ var require_parser = __commonJS({
     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;
     });
@@ -12136,7 +12175,7 @@ var require_parser = __commonJS({
     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",
@@ -12147,7 +12186,7 @@ var require_parser = __commonJS({
     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();
@@ -12164,11 +12203,11 @@ var require_parser = __commonJS({
     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);
     }
@@ -12182,11 +12221,13 @@ var require_parser = __commonJS({
     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) {
@@ -12680,7 +12721,7 @@ var require_parser = __commonJS({
     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,
@@ -13180,6 +13221,7 @@ var require_parser = __commonJS({
     exports.TemplateBlockCharacters = TemplateBlockCharacters;
     exports.ReservedWord = ReservedWord;
     exports.Comment = Comment;
+    exports._Comment = _Comment;
     exports.SingleLineComment = SingleLineComment;
     exports.JSSingleLineComment = JSSingleLineComment;
     exports.MultiLineComment = MultiLineComment;
@@ -13494,6 +13536,7 @@ var require_parser = __commonJS({
       makeRef,
       maybeRef,
       modifyString,
+      negateCondition,
       processAssignmentDeclaration,
       processBinaryOpExpression,
       processCallMemberExpression,

package/dist/ts-diagnostic.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,31 +15,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ts_diagnostic_exports = {};
 __export(ts_diagnostic_exports, {
-  convertDiagnostic: () => convertDiagnostic,
   flattenDiagnosticMessageText: () => flattenDiagnosticMessageText,
-  rangeFromTextSpan: () => rangeFromTextSpan,
   remapPosition: () => remapPosition,
   remapRange: () => remapRange
 });
 module.exports = __toCommonJS(ts_diagnostic_exports);
-var import_vscode_languageserver = __toESM(require("vscode-languageserver"));
-var import_vscode_languageserver_textdocument = require("vscode-languageserver-textdocument");
-let DiagnosticCategory = {};
-DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
-DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
-DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
-DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
 function remapPosition(position, sourcemapLines) {
   if (!sourcemapLines)
     return position;
@@ -102,51 +83,9 @@ function flattenDiagnosticMessageText(diag, indent = 0) {
   }
   return result;
 }
-function rangeFromTextSpan(span, document) {
-  return {
-    start: document.positionAt(span.start),
-    end: document.positionAt(span.start + span.length)
-  };
-}
-function convertDiagnostic(diagnostic, document, sourcemapLines) {
-  return {
-    message: flattenDiagnosticMessageText(diagnostic.messageText),
-    range: remapRange(
-      rangeFromTextSpan(
-        {
-          start: diagnostic.start || 0,
-          length: diagnostic.length ?? 1
-        },
-        document
-      ),
-      sourcemapLines
-    ),
-    severity: diagnosticCategoryToSeverity(diagnostic.category),
-    code: diagnostic.code,
-    source: diagnostic.source || "typescript"
-  };
-}
-function diagnosticCategoryToSeverity(category) {
-  switch (category) {
-    case DiagnosticCategory.Warning: {
-      return import_vscode_languageserver.DiagnosticSeverity.Warning;
-    }
-    case DiagnosticCategory.Error: {
-      return import_vscode_languageserver.DiagnosticSeverity.Error;
-    }
-    case DiagnosticCategory.Suggestion: {
-      return import_vscode_languageserver.DiagnosticSeverity.Hint;
-    }
-    case DiagnosticCategory.Message: {
-      return import_vscode_languageserver.DiagnosticSeverity.Information;
-    }
-  }
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  convertDiagnostic,
   flattenDiagnosticMessageText,
-  rangeFromTextSpan,
   remapPosition,
   remapRange
 });

package/dist/ts-diagnostic.mjs

@@ -1,10 +1,3 @@
-let DiagnosticCategory = {};
-DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
-DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
-DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
-DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
-import vs, { DiagnosticSeverity, Position, Range } from "vscode-languageserver";
-import { TextDocument } from "vscode-languageserver-textdocument";
 function remapPosition(position, sourcemapLines) {
   if (!sourcemapLines)
     return position;
@@ -65,50 +58,8 @@ function flattenDiagnosticMessageText(diag, indent = 0) {
   }
   return result;
 }
-function rangeFromTextSpan(span, document) {
-  return {
-    start: document.positionAt(span.start),
-    end: document.positionAt(span.start + span.length)
-  };
-}
-function convertDiagnostic(diagnostic, document, sourcemapLines) {
-  return {
-    message: flattenDiagnosticMessageText(diagnostic.messageText),
-    range: remapRange(
-      rangeFromTextSpan(
-        {
-          start: diagnostic.start || 0,
-          length: diagnostic.length ?? 1
-        },
-        document
-      ),
-      sourcemapLines
-    ),
-    severity: diagnosticCategoryToSeverity(diagnostic.category),
-    code: diagnostic.code,
-    source: diagnostic.source || "typescript"
-  };
-}
-function diagnosticCategoryToSeverity(category) {
-  switch (category) {
-    case DiagnosticCategory.Warning: {
-      return DiagnosticSeverity.Warning;
-    }
-    case DiagnosticCategory.Error: {
-      return DiagnosticSeverity.Error;
-    }
-    case DiagnosticCategory.Suggestion: {
-      return DiagnosticSeverity.Hint;
-    }
-    case DiagnosticCategory.Message: {
-      return DiagnosticSeverity.Information;
-    }
-  }
-}
 export {
-  convertDiagnostic,
   flattenDiagnosticMessageText,
-  rangeFromTextSpan,
   remapPosition,
   remapRange
 };