@danielx/civet 0.6.16 → 0.6.18

package/dist/main.mjs

@@ -943,6 +943,9 @@ var require_lib = __commonJS({
     function isVoidType(t) {
       return t?.type === "LiteralType" && t.t.type === "VoidType";
     }
+    function isPromiseVoidType(t) {
+      return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
+    }
     function isWhitespaceOrEmpty(node) {
       if (!node)
         return true;
@@ -1388,8 +1391,8 @@ var require_lib = __commonJS({
           implicitFunctionBlock(f);
         processParams(f);
         if (!processReturnValue(f) && config.implicitReturns) {
-          const { block, returnType } = f;
-          const isVoid = isVoidType(returnType?.t);
+          const { async, block, returnType } = f;
+          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
           const isBlock = block?.type === "BlockStatement";
           if (!isVoid && isBlock) {
             insertReturn(block);
@@ -2111,7 +2114,7 @@ var require_lib = __commonJS({
         if (!hasDec(x))
           return a.indexOf(x) === i;
       }).forEach(pushVar);
-      const fnNodes = gatherNodes(statements, (s) => s.type === "FunctionExpression");
+      const fnNodes = gatherNodes(statements, isFunction);
       const forNodes = gatherNodes(statements, (s) => s.type === "ForStatement");
       const blockNodes = new Set(gatherNodes(statements, (s) => s.type === "BlockStatement"));
       fnNodes.forEach(({ block }) => blockNodes.delete(block));
@@ -2163,7 +2166,7 @@ var require_lib = __commonJS({
       }
       let currentScope = /* @__PURE__ */ new Set();
       scopes.push(currentScope);
-      const fnNodes = gatherNodes(statements, (s) => s.type === "FunctionExpression");
+      const fnNodes = gatherNodes(statements, isFunction);
       const forNodes = gatherNodes(statements, (s) => s.type === "ForStatement");
       let targetStatements = [];
       for (const statement of statements) {
@@ -2996,6 +2999,7 @@ ${input.slice(result.pos)}
       NonPipelineArgumentPart,
       BinaryOpExpression,
       BinaryOpRHS,
+      WRHS,
       SingleLineBinaryOpRHS,
       RHS,
       ParenthesizedAssignment,
@@ -3105,6 +3109,8 @@ ${input.slice(result.pos)}
       ExplicitBlock,
       ImplicitNestedBlock,
       Block,
+      BareNestedBlock,
+      BareBlock,
       ThenClause,
       BracedOrEmptyBlock,
       NoPostfixBracedOrEmptyBlock,
@@ -3229,7 +3235,9 @@ ${input.slice(result.pos)}
       PatternExpressionList,
       ConditionFragment,
       CaseExpressionList,
+      CaseExpression,
       ImpliedColon,
+      IgnoreColon,
       TryStatement,
       TryExpression,
       CatchClause,
@@ -3572,6 +3580,7 @@ ${input.slice(result.pos)}
       EOS,
       EOL,
       DebugHere,
+      InsertColon,
       InsertSemicolon,
       InsertOpenParen,
       InsertCloseParen,
@@ -3872,23 +3881,24 @@ ${input.slice(result.pos)}
     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("\\s", "suy"));
-    var $R50 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-    var $R51 = $R(new RegExp("[\\s>]|\\/>", "suy"));
-    var $R52 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
-    var $R53 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
-    var $R54 = $R(new RegExp("[<>]", "suy"));
-    var $R55 = $R(new RegExp("[!~+-](?!\\s|[!~+-]*&)", "suy"));
-    var $R56 = $R(new RegExp("(?:-[^-]|[^-]*)*", "suy"));
-    var $R57 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-    var $R58 = $R(new RegExp("[+-]?", "suy"));
-    var $R59 = $R(new RegExp("[+-]", "suy"));
-    var $R60 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-    var $R61 = $R(new RegExp("[\\t ]*", "suy"));
-    var $R62 = $R(new RegExp("[\\s]*", "suy"));
-    var $R63 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-    var $R64 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-    var $R65 = $R(new RegExp("[ \\t]*", "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|\\n|\\r|$", "suy"));
+    var $R66 = $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({
@@ -4803,9 +4813,10 @@ ${input.slice(result.pos)}
       var rhs = $2;
       return [[], op, [], rhs];
     });
-    var BinaryOpRHS$1 = $TS($S(NewlineBinaryOpAllowed, $S(NotDedentedBinaryOp, $C(_, $S(EOS, __)), RHS)), function($skip, $loc, $0, $1, $2) {
-      var rhs = $2;
-      return [...rhs[0], ...rhs.slice(1)];
+    var BinaryOpRHS$1 = $TS($S(NewlineBinaryOpAllowed, NotDedentedBinaryOp, WRHS), function($skip, $loc, $0, $1, $2, $3) {
+      var op = $2;
+      var rhs = $3;
+      return [...op, ...rhs];
     });
     var BinaryOpRHS$2 = $T($S($N(NewlineBinaryOpAllowed), SingleLineBinaryOpRHS), function(value) {
       return value[1];
@@ -4832,6 +4843,35 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var WRHS$0 = $TS($S(PushIndent, $E($S(Nested, RHS)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+      var wrhs = $2;
+      if (!wrhs)
+        return $skip;
+      return wrhs;
+    });
+    var WRHS$1 = $S($C(_, $S(EOS, __)), RHS);
+    function WRHS(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("WRHS", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("WRHS", state, WRHS$0(state) || WRHS$1(state));
+        if (state.events)
+          state.events.exit?.("WRHS", state, result, eventData);
+        return result;
+      } else {
+        const result = WRHS$0(state) || WRHS$1(state);
+        if (state.events)
+          state.events.exit?.("WRHS", state, result, eventData);
+        return result;
+      }
+    }
     var SingleLineBinaryOpRHS$0 = $TS($S($E(_), BinaryOp, $C(_, $S(EOS, __)), RHS), function($skip, $loc, $0, $1, $2, $3, $4) {
       var ws1 = $1;
       var op = $2;
@@ -5538,8 +5578,8 @@ ${input.slice(result.pos)}
     var PrimaryExpression$2 = TemplateLiteral;
     var PrimaryExpression$3 = Literal;
     var PrimaryExpression$4 = ArrayLiteral;
-    var PrimaryExpression$5 = IdentifierReference;
-    var PrimaryExpression$6 = FunctionExpression;
+    var PrimaryExpression$5 = FunctionExpression;
+    var PrimaryExpression$6 = IdentifierReference;
     var PrimaryExpression$7 = ClassExpression;
     var PrimaryExpression$8 = RegularExpressionLiteral;
     var PrimaryExpression$9 = ParenthesizedExpression;
@@ -6606,6 +6646,8 @@ ${input.slice(result.pos)}
     var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral)), function($skip, $loc, $0, $1, $2) {
       var dot = $1;
       var str = $2;
+      if (Array.isArray(dot))
+        dot = dot[0];
       return {
         type: "Index",
         children: [
@@ -6618,6 +6660,8 @@ ${input.slice(result.pos)}
     var MemberBracketContent$2 = $TS($S(Dot, IntegerLiteral), function($skip, $loc, $0, $1, $2) {
       var dot = $1;
       var num = $2;
+      if (Array.isArray(dot))
+        dot = dot[0];
       return {
         type: "Index",
         children: [
@@ -8465,6 +8509,70 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var BareNestedBlock$0 = $TS($S($Y(EOS), AllowAll, $E(NestedBlockStatements), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+      if (!$3)
+        return $skip;
+      return $3;
+    });
+    function BareNestedBlock(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("BareNestedBlock", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("BareNestedBlock", state, BareNestedBlock$0(state));
+        if (state.events)
+          state.events.exit?.("BareNestedBlock", state, result, eventData);
+        return result;
+      } else {
+        const result = BareNestedBlock$0(state);
+        if (state.events)
+          state.events.exit?.("BareNestedBlock", state, result, eventData);
+        return result;
+      }
+    }
+    var BareBlock$0 = BareNestedBlock;
+    var BareBlock$1 = ExplicitBlock;
+    var BareBlock$2 = ThenClause;
+    var BareBlock$3 = $TS($S($E(_), $N(EOS), Statement), function($skip, $loc, $0, $1, $2, $3) {
+      var ws = $1;
+      var s = $3;
+      const expressions = [[ws, s]];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: [expressions],
+        bare: true
+      };
+    });
+    var BareBlock$4 = EmptyBareBlock;
+    function BareBlock(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("BareBlock", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("BareBlock", state, BareBlock$0(state) || BareBlock$1(state) || BareBlock$2(state) || BareBlock$3(state) || BareBlock$4(state));
+        if (state.events)
+          state.events.exit?.("BareBlock", state, result, eventData);
+        return result;
+      } else {
+        const result = BareBlock$0(state) || BareBlock$1(state) || BareBlock$2(state) || BareBlock$3(state) || BareBlock$4(state);
+        if (state.events)
+          state.events.exit?.("BareBlock", state, result, eventData);
+        return result;
+      }
+    }
     var ThenClause$0 = $T($S(Then, SingleLineStatements), function(value) {
       return value[1];
     });
@@ -9799,10 +9907,24 @@ ${input.slice(result.pos)}
     var NestedPropertyDefinition$0 = $TS($S(Nested, $P($S(PropertyDefinition, ObjectPropertyDelimiter))), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var inlineProps = $2;
-      return inlineProps.map(([prop, delimiter], i) => ({
-        ...prop,
-        children: [...i === 0 ? ws : [], ...prop.children, delimiter]
-      }));
+      return inlineProps.flatMap(([prop, delim], i) => {
+        if (!Array.isArray(prop))
+          prop = [prop];
+        if (i === 0) {
+          const [first, ...rest] = prop;
+          prop = [{ ...first, children: [...ws, ...first.children] }, ...rest];
+        }
+        const last = prop[prop.length - 1];
+        prop = [
+          ...prop.slice(0, prop.length - 1),
+          {
+            ...last,
+            delim,
+            children: [...last.children, delim]
+          }
+        ];
+        return prop;
+      });
     });
     function NestedPropertyDefinition(state) {
       let eventData;
@@ -9913,12 +10035,15 @@ ${input.slice(result.pos)}
       }
     }
     var PropertyDefinitionList$0 = $TV($P($S(PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
-      return $0.map(([prop, delim]) => {
-        return {
-          ...prop,
+      return $0.flatMap(([prop, delim]) => {
+        prop = Array.isArray(prop) ? prop : [prop];
+        let last = prop[prop.length - 1];
+        last = {
+          ...last,
           delim,
-          children: [...prop.children, delim]
+          children: [...last.children, delim]
         };
+        return [...prop.slice(0, prop.length - 1), last];
       });
     });
     function PropertyDefinitionList(state) {
@@ -10002,8 +10127,19 @@ ${input.slice(result.pos)}
     var PropertyDefinition$5 = $TS($S(__, CallExpression), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var value = $2;
-      if (value.type === "Identifier") {
-        return { ...value, children: [ws, ...value.children] };
+      switch (value.type) {
+        case "Identifier":
+          return { ...value, children: [ws, ...value.children] };
+        case "ObjectExpression":
+          let first = value.properties[0];
+          if (first) {
+            first = {
+              ...first,
+              children: [ws, ...first.children],
+              hoistDec: value.hoistDec
+            };
+          }
+          return [first, ...value.properties.slice(1)];
       }
       const last = lastAccessInCallExpression(value);
       if (!last)
@@ -10215,13 +10351,17 @@ ${input.slice(result.pos)}
       return {
         type: "ComputedPropertyName",
         children: $0,
-        expression
+        expression,
+        implicit: true
       };
     });
     var ComputedPropertyName$2 = $TS($S(InsertOpenBracket, $EXPECT($L20, fail, 'ComputedPropertyName "-"'), NumericLiteral, InsertCloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+      const expression = [$2, $3];
       return {
         type: "ComputedPropertyName",
-        children: $0
+        expression,
+        children: [$1, expression, $4],
+        implicit: true
       };
     });
     function ComputedPropertyName(state) {
@@ -12849,7 +12989,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CaseClause$0 = $TS($S(PatternExpressionList, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
+    var CaseClause$0 = $TS($S(PatternExpressionList, $C(ThenClause, BareBlock)), function($skip, $loc, $0, $1, $2) {
       var patterns = $1;
       var block = $2;
       return {
@@ -12859,13 +12999,13 @@ ${input.slice(result.pos)}
         patterns
       };
     });
-    var CaseClause$1 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
+    var CaseClause$1 = $T($S(Case, CaseExpressionList, IgnoreColon, $C(ThenClause, BareBlock)), function(value) {
       return { "type": "CaseClause", "children": value };
     });
-    var CaseClause$2 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, EmptyBareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var CaseClause$2 = $TS($S(When, CaseExpressionList, IgnoreColon, InsertOpenBrace, $C(ThenClause, BareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       var cases = $2;
-      var block = $4;
-      var b = $5;
+      var block = $5;
+      var b = $6;
       return {
         type: "WhenClause",
         cases,
@@ -12874,7 +13014,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$3 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$3 = $TS($S(Default, ImpliedColon, $C(ThenClause, BareBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var block = $3;
       return {
         type: "DefaultClause",
@@ -12970,7 +13110,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CaseExpressionList$0 = $TS($S(ForbidMultiLineImplicitObjectLiteral, $E($S($Q(_), ExpressionWithObjectApplicationForbidden, ImpliedColon)), $Q($S(__, Comma, ExpressionWithObjectApplicationForbidden, ImpliedColon)), RestoreMultiLineImplicitObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CaseExpressionList$0 = $TS($S(ForbidMultiLineImplicitObjectLiteral, $E($S($E(_), CaseExpression, InsertColon)), $Q($S(__, Comma, CaseExpression, InsertColon)), RestoreMultiLineImplicitObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4) {
       var first = $2;
       var rest = $3;
       if (!first)
@@ -13006,10 +13146,40 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImpliedColon$0 = $S($E(_), Colon);
-    var ImpliedColon$1 = $TV($EXPECT($L0, fail, 'ImpliedColon ""'), function($skip, $loc, $0, $1) {
-      return { $loc, token: ":" };
+    var CaseExpression$0 = $TS($S(PropertyName, $Y($S($E(_), Colon))), function($skip, $loc, $0, $1, $2) {
+      var value = $1;
+      if (value.type === "ComputedPropertyName") {
+        if (value.implicit)
+          return value.expression;
+        return { ...value, type: "ArrayExpression" };
+      }
+      return value;
     });
+    var CaseExpression$1 = ExpressionWithObjectApplicationForbidden;
+    function CaseExpression(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("CaseExpression", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("CaseExpression", state, CaseExpression$0(state) || CaseExpression$1(state));
+        if (state.events)
+          state.events.exit?.("CaseExpression", state, result, eventData);
+        return result;
+      } else {
+        const result = CaseExpression$0(state) || CaseExpression$1(state);
+        if (state.events)
+          state.events.exit?.("CaseExpression", state, result, eventData);
+        return result;
+      }
+    }
+    var ImpliedColon$0 = $S($E(_), Colon);
+    var ImpliedColon$1 = InsertColon;
     function ImpliedColon(state) {
       let eventData;
       if (state.events) {
@@ -13032,6 +13202,32 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var IgnoreColon$0 = $TV($E($S($E(_), Colon)), function($skip, $loc, $0, $1) {
+      if ($1)
+        return $1[0];
+    });
+    function IgnoreColon(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("IgnoreColon", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("IgnoreColon", state, IgnoreColon$0(state));
+        if (state.events)
+          state.events.exit?.("IgnoreColon", state, result, eventData);
+        return result;
+      } else {
+        const result = IgnoreColon$0(state);
+        if (state.events)
+          state.events.exit?.("IgnoreColon", state, result, eventData);
+        return result;
+      }
+    }
     var TryStatement$0 = $TS($S(Try, $N($EXPECT($L12, fail, 'TryStatement ":"')), NoPostfixBracedOrEmptyBlock, $E(CatchClause), $E(FinallyClause)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var t = $1;
       var b = $3;
@@ -17363,6 +17559,13 @@ ${input.slice(result.pos)}
     var Dot$0 = $TV($EXPECT($L6, fail, 'Dot "."'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
+    var Dot$1 = $TS($S($EXPECT($R49, fail, "Dot /['\u2019]s/"), _), function($skip, $loc, $0, $1, $2) {
+      var ws = $2;
+      return [
+        { $loc, token: "." },
+        insertTrimmingSpace(ws, "")
+      ];
+    });
     function Dot(state) {
       let eventData;
       if (state.events) {
@@ -17374,12 +17577,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("Dot", state, Dot$0(state));
+        const result = $TOKEN("Dot", state, Dot$0(state) || Dot$1(state));
         if (state.events)
           state.events.exit?.("Dot", state, result, eventData);
         return result;
       } else {
-        const result = Dot$0(state);
+        const result = Dot$0(state) || Dot$1(state);
         if (state.events)
           state.events.exit?.("Dot", state, result, eventData);
         return result;
@@ -17741,7 +17944,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R49, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
+    var Import$0 = $TS($S($EXPECT($L17, fail, 'Import "import"'), $Y($EXPECT($R50, fail, "Import /\\s/"))), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function Import(state) {
@@ -19319,7 +19522,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXIdentifierName$0 = $R$0($EXPECT($R50, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
+    var JSXIdentifierName$0 = $R$0($EXPECT($R51, fail, "JSXIdentifierName /(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*/"));
     function JSXIdentifierName(state) {
       let eventData;
       if (state.events) {
@@ -19557,7 +19760,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXAttributeSpace$0 = $R$0($EXPECT($R51, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
+    var JSXAttributeSpace$0 = $R$0($EXPECT($R52, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
     function JSXAttributeSpace(state) {
       let eventData;
       if (state.events) {
@@ -19580,7 +19783,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXShorthandString$0 = $TR($EXPECT($R52, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var JSXShorthandString$0 = $TR($EXPECT($R53, fail, "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) {
@@ -19669,7 +19872,7 @@ ${input.slice(result.pos)}
       }
       return [open, value, close];
     });
-    var JSXAttributeValue$4 = $R$0($EXPECT($R53, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
+    var JSXAttributeValue$4 = $R$0($EXPECT($R54, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
     function JSXAttributeValue(state) {
       let eventData;
       if (state.events) {
@@ -19719,7 +19922,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R54, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
+    var InlineJSXBinaryOpRHS$0 = $TS($S($N($EXPECT($R55, fail, "InlineJSXBinaryOpRHS /[<>]/")), BinaryOp, InlineJSXUnaryExpression), function($skip, $loc, $0, $1, $2, $3) {
       var op = $2;
       var rhs = $3;
       return [[], op, [], rhs];
@@ -19774,7 +19977,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineJSXUnaryOp$0 = $TR($EXPECT($R55, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var InlineJSXUnaryOp$0 = $TR($EXPECT($R56, fail, "InlineJSXUnaryOp /[!~+-](?!\\s|[!~+-]*&)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0 };
     });
     function InlineJSXUnaryOp(state) {
@@ -20264,7 +20467,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXCommentContent$0 = $TR($EXPECT($R56, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var JSXCommentContent$0 = $TR($EXPECT($R57, fail, "JSXCommentContent /(?:-[^-]|[^-]*)*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0.replace(/\*\//g, "* /") };
     });
     function JSXCommentContent(state) {
@@ -20289,7 +20492,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXText$0 = $TR($EXPECT($R57, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var JSXText$0 = $TR($EXPECT($R58, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return {
         type: "JSXText",
         token: $0,
@@ -21257,7 +21460,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R58, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
+    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R59, fail, "TypeIndexSignature /[+-]?/")), Readonly, NotDedented)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R60, fail, "TypeIndexSignature /[+-]/")), $Y($S($E(_), QuestionMark)))));
     function TypeIndexSignature(state) {
       let eventData;
       if (state.events) {
@@ -21708,17 +21911,25 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeElement$0 = $S($S(__, DotDotDot, __), Type);
-    var TypeElement$1 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
+    var TypeElement$0 = $TS($S(__, IdentifierName, $E(_), DotDotDot, $S(__, $E($S(QuestionMark, $E(_))), Colon, __), Type), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var ws = $1;
+      var name = $2;
+      var space = $3;
+      var dots = $4;
+      var colon = $5;
+      var type = $6;
+      return [ws, dots, space, name, colon, type];
+    });
+    var TypeElement$1 = $TS($S(Type, $E(_), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
       var type = $1;
-      var dots = $2;
-      if (!dots)
-        return type;
+      var space = $2;
+      var dots = $3;
       const ws = getTrimmingSpace(type);
       if (!ws)
-        return [dots[1], dots[0], type];
-      return [ws, dots[1], dots[0], insertTrimmingSpace(type, "")];
+        return [dots, space, type];
+      return [ws, dots, space, insertTrimmingSpace(type, "")];
     });
+    var TypeElement$2 = $S($E($S(__, DotDotDot)), $E($S(__, IdentifierName, __, $E($S(QuestionMark, $E(_))), Colon, __)), Type);
     function TypeElement(state) {
       let eventData;
       if (state.events) {
@@ -21730,12 +21941,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state));
+        const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state));
         if (state.events)
           state.events.exit?.("TypeElement", state, result, eventData);
         return result;
       } else {
-        const result = TypeElement$0(state) || TypeElement$1(state);
+        const result = TypeElement$0(state) || TypeElement$1(state) || TypeElement$2(state);
         if (state.events)
           state.events.exit?.("TypeElement", state, result, eventData);
         return result;
@@ -21769,7 +21980,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedType$0 = $S(Nested, Type, ArrayElementDelimiter);
+    var NestedType$0 = $S(Nested, TypeElement, ArrayElementDelimiter);
     function NestedType(state) {
       let eventData;
       if (state.events) {
@@ -22109,7 +22320,8 @@ ${input.slice(result.pos)}
       }
     }
     var TypeArguments$0 = $TS($S($EXPECT($L155, fail, 'TypeArguments "<"'), $P(TypeArgument), __, $EXPECT($L34, fail, 'TypeArguments ">"')), function($skip, $loc, $0, $1, $2, $3, $4) {
-      return { ts: true, children: $0 };
+      var args = $2;
+      return { ts: true, types: args.map(([, t]) => t), children: $0 };
     });
     function TypeArguments(state) {
       let eventData;
@@ -22331,7 +22543,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Shebang$0 = $S($R$0($EXPECT($R60, fail, "Shebang /#![^\\r\\n]*/")), EOL);
+    var Shebang$0 = $S($R$0($EXPECT($R61, fail, "Shebang /#![^\\r\\n]*/")), EOL);
     function Shebang(state) {
       let eventData;
       if (state.events) {
@@ -22354,11 +22566,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologue$0 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
+    var CivetPrologue$0 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
       var content = value[2];
       return content;
     });
-    var CivetPrologue$1 = $T($S($EXPECT($R61, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
+    var CivetPrologue$1 = $T($S($EXPECT($R62, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(SimpleStatementDelimiter), $E(EOS)), function(value) {
       var content = value[2];
       return content;
     });
@@ -22384,7 +22596,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R62, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var CivetPrologueContent$0 = $TS($S($EXPECT($L206, fail, 'CivetPrologueContent "civet"'), NonIdContinue, $Q(CivetOption), $EXPECT($R63, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
       var options = $3;
       return {
         type: "CivetPrologue",
@@ -22414,7 +22626,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetOption$0 = $TR($EXPECT($R63, fail, "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($R64, fail, "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();
@@ -22450,7 +22662,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var UnknownPrologue$0 = $S($R$0($EXPECT($R61, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
+    var UnknownPrologue$0 = $S($R$0($EXPECT($R62, fail, "UnknownPrologue /[\\t ]*/")), StringLiteral, $TEXT(SimpleStatementDelimiter), EOS);
     function UnknownPrologue(state) {
       let eventData;
       if (state.events) {
@@ -22520,7 +22732,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var EOL$0 = $TR($EXPECT($R64, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var EOL$0 = $TR($EXPECT($R65, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0 };
     });
     function EOL(state) {
@@ -22570,6 +22782,31 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var InsertColon$0 = $TV($EXPECT($L0, fail, 'InsertColon ""'), function($skip, $loc, $0, $1) {
+      return { $loc, token: ":" };
+    });
+    function InsertColon(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("InsertColon", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("InsertColon", state, InsertColon$0(state));
+        if (state.events)
+          state.events.exit?.("InsertColon", state, result, eventData);
+        return result;
+      } else {
+        const result = InsertColon$0(state);
+        if (state.events)
+          state.events.exit?.("InsertColon", state, result, eventData);
+        return result;
+      }
+    }
     var InsertSemicolon$0 = $TV($EXPECT($L0, fail, 'InsertSemicolon ""'), function($skip, $loc, $0, $1) {
       return { $loc, token: ";" };
     });
@@ -23681,7 +23918,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Indent$0 = $TR($EXPECT($R65, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var Indent$0 = $TR($EXPECT($R66, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       let level;
       if (module.config.tab) {
         const tabs = $0.match(/\t/g);