@danielx/civet 0.7.33 → 0.7.35

package/dist/browser.js

@@ -573,11 +573,13 @@ ${body}`;
     processProgramAsync: () => processProgramAsync,
     processTryBlock: () => processTryBlock,
     processUnaryExpression: () => processUnaryExpression,
+    processUnaryNestedExpression: () => processUnaryNestedExpression,
     quoteString: () => quoteString,
     reorderBindingRestProperty: () => reorderBindingRestProperty,
     replaceNode: () => replaceNode,
     replaceNodes: () => replaceNodes,
     skipImplicitArguments: () => skipImplicitArguments,
+    stripTrailingImplicitComma: () => stripTrailingImplicitComma,
     trimFirstSpace: () => trimFirstSpace,
     typeOfJSX: () => typeOfJSX,
     wrapIIFE: () => wrapIIFE
@@ -714,6 +716,40 @@ ${body}`;
       return node.every(isWhitespaceOrEmpty);
     return false;
   }
+  function firstNonSpace(node) {
+    if (!(node != null)) {
+      return;
+    }
+    if (Array.isArray(node)) {
+      for (let i2 = 0, len22 = node.length; i2 < len22; i2++) {
+        const child = node[i2];
+        let ref1;
+        if (ref1 = firstNonSpace(child)) {
+          const first = ref1;
+          return first;
+        }
+      }
+      return void 0;
+    } else if (isParent(node)) {
+      let ref2;
+      if (ref2 = firstNonSpace(node.children)) {
+        const first = ref2;
+        return first;
+      } else {
+        return node;
+      }
+    } else if (isToken(node)) {
+      let m;
+      if (m = node.token, typeof m === "string" && /^[ \t]*$/.test(m)) {
+        return;
+      }
+    } else if (typeof node === "string") {
+      if (typeof node === "string" && /^[ \t]*$/.test(node)) {
+        return;
+      }
+    }
+    return node;
+  }
   function isExit(node) {
     if (!(node != null)) {
       return false;
@@ -751,6 +787,14 @@ ${body}`;
     ;
     return;
   }
+  function stripTrailingImplicitComma(children) {
+    const last = children[children.length - 1];
+    if (isComma(last) && last.implicit) {
+      return children.slice(0, -1);
+    } else {
+      return children;
+    }
+  }
   function insertTrimmingSpace(target, c) {
     if (!(target != null)) {
       return target;
@@ -923,8 +967,8 @@ ${body}`;
       return void 0;
     }
     if (Array.isArray(node)) {
-      for (let i2 = 0, len22 = node.length; i2 < len22; i2++) {
-        const child = node[i2];
+      for (let i3 = 0, len3 = node.length; i3 < len3; i3++) {
+        const child = node[i3];
         if (skip(child)) {
           continue;
         }
@@ -1011,6 +1055,9 @@ ${body}`;
         return expression;
       }
     }
+    return parenthesizeExpression(expression);
+  }
+  function parenthesizeExpression(expression) {
     return makeNode({
       type: "ParenthesizedExpression",
       children: ["(", expression, ")"],
@@ -1026,8 +1073,8 @@ ${body}`;
       return;
     }
     if (Array.isArray(node)) {
-      for (let i3 = 0, len3 = node.length; i3 < len3; i3++) {
-        const child = node[i3];
+      for (let i4 = 0, len4 = node.length; i4 < len4; i4++) {
+        const child = node[i4];
         updateParentPointers(child, parent, depth);
       }
       return;
@@ -1037,8 +1084,8 @@ ${body}`;
       node.parent = parent;
     }
     if (depth && isParent(node)) {
-      for (let ref1 = node.children, i4 = 0, len4 = ref1.length; i4 < len4; i4++) {
-        const child = ref1[i4];
+      for (let ref3 = node.children, i5 = 0, len5 = ref3.length; i5 < len5; i5++) {
+        const child = ref3[i5];
         updateParentPointers(child, node, depth - 1);
       }
     }
@@ -1094,12 +1141,11 @@ ${body}`;
     ]);
   }
   var typeNeedsNoParens = /* @__PURE__ */ new Set([
-    "IdentifierType",
+    "TypeIdentifier",
     "ImportType",
-    "LiteralType",
+    "TypeLiteral",
     "TupleType",
-    "ParenthesizedType",
-    "UnaryType"
+    "TypeParenthesized"
   ]);
   function parenthesizeType(type) {
     if (typeNeedsNoParens.has(type.type)) {
@@ -1169,8 +1215,8 @@ ${body}`;
         children.splice(1, 0, ".bind(this)");
       }
       if (gatherRecursiveWithinFunction(block, (a2) => typeof a2 === "object" && a2 != null && "token" in a2 && a2.token === "arguments").length) {
-        let ref2;
-        children[children.length - 1] = (ref2 = parameters.children)[ref2.length - 1] = "(arguments)";
+        let ref4;
+        children[children.length - 1] = (ref4 = parameters.children)[ref4.length - 1] = "(arguments)";
       }
     }
     const exp = makeNode({
@@ -1193,9 +1239,9 @@ ${body}`;
   }
   function flatJoin(array, separator) {
     const result = [];
-    for (let i5 = 0, len5 = array.length; i5 < len5; i5++) {
-      const i = i5;
-      const items = array[i5];
+    for (let i6 = 0, len6 = array.length; i6 < len6; i6++) {
+      const i = i6;
+      const items = array[i6];
       if (i) {
         result.push(separator);
       }
@@ -1589,16 +1635,10 @@ ${body}`;
 
   // source/parser/function.civet
   function isVoidType(t) {
-    return t?.type === "LiteralType" && t.t.type === "VoidType";
+    return t?.type === "TypeLiteral" && 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 isGeneratorVoidType(t) {
-    return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
-  }
-  function isAsyncGeneratorVoidType(t) {
-    return t?.type === "IdentifierType" && (t.raw === "AsyncIterator" || t.raw === "AsyncGenerator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+    return t?.type === "TypeIdentifier" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
   }
   function implicitFunctionBlock(f) {
     if (f.abstract || f.block || f.signature?.optional)
@@ -1637,7 +1677,7 @@ ${body}`;
       const { async, generator, set } = modifier;
       const isMethod = f.type === "MethodDefinition";
       const isConstructor = isMethod && name === "constructor";
-      const isVoid = isVoidType(returnType2?.t) || async && (isPromiseVoidType(returnType2?.t) || generator && isAsyncGeneratorVoidType(returnType2?.t)) || !async && generator && isGeneratorVoidType(returnType2?.t);
+      const isVoid = generator || isVoidType(returnType2?.t) || async && isPromiseVoidType(returnType2?.t);
       if (block?.type === "BlockStatement") {
         if (isVoid || set || isConstructor) {
           if (block.bare && block.implicitlyReturned) {
@@ -1653,10 +1693,7 @@ ${body}`;
   }
   function processReturnValue(func) {
     const { block } = func;
-    const values = gatherRecursiveWithinFunction(
-      block,
-      ({ type }) => type === "ReturnValue"
-    );
+    const values = gatherRecursiveWithinFunction(block, ($) => $.type === "ReturnValue");
     if (!values.length) {
       return false;
     }
@@ -1666,7 +1703,7 @@ ${body}`;
       value.children = [ref];
       const { ancestor, child } = findAncestor(
         value,
-        ({ type }) => type === "Declaration",
+        ($1) => $1.type === "Declaration",
         isFunction
       );
       if (ancestor) {
@@ -1686,8 +1723,8 @@ ${body}`;
       }
     }
     if (declaration) {
-      if (!(declaration.suffix != null)) {
-        declaration.children[1] = declaration.suffix = returnType;
+      if (!(declaration.typeSuffix != null)) {
+        declaration.children[1] = declaration.typeSuffix = returnType;
       }
     } else {
       block.expressions.unshift([
@@ -1796,14 +1833,13 @@ ${body}`;
     if (isExit(exp)) {
       return;
     }
+    exp = exp;
     const outer = exp;
-    let { type } = exp;
-    if (type === "LabelledStatement") {
+    if (exp.type === "LabelledStatement") {
       exp = exp.statement;
-      ({ type } = exp);
     }
     let ref4;
-    switch (type) {
+    switch (exp.type) {
       case "BreakStatement":
       case "ContinueStatement":
       case "DebuggerStatement":
@@ -2028,7 +2064,7 @@ ${body}`;
     let changed = false;
     for (const control of gatherRecursiveWithinFunction(
       statement.block,
-      ($) => $.type === "BreakStatement" || $.type === "ContinueStatement"
+      ($2) => $2.type === "BreakStatement" || $2.type === "ContinueStatement"
     )) {
       let controlName2 = function() {
         switch (control.type) {
@@ -2063,7 +2099,7 @@ ${body}`;
           )
         );
         updateParentPointers(control.with, control);
-        const i = control.children.findIndex(($1) => $1?.type === "Error");
+        const i = control.children.findIndex(($3) => $3?.type === "Error");
         if (i >= 0) {
           control.children.splice(i, 1);
         }
@@ -2187,8 +2223,8 @@ ${body}`;
     }
     if (hasYield(block) && !f.generator?.length) {
       if (f.type === "ArrowFunction") {
-        gatherRecursiveWithinFunction(block, ($2) => $2.type === "YieldExpression").forEach((y) => {
-          const i = y.children.findIndex(($3) => $3.type === "Yield");
+        gatherRecursiveWithinFunction(block, ($4) => $4.type === "YieldExpression").forEach((y) => {
+          const i = y.children.findIndex(($5) => $5.type === "Yield");
           return y.children.splice(i + 1, 0, {
             type: "Error",
             message: "Can't use yield inside of => arrow function"
@@ -2312,12 +2348,13 @@ ${body}`;
       expression = {
         ...expression,
         parameters: newParameters,
-        children: expression.children.map(($4) => $4 === parameters ? newParameters : $4)
+        children: expression.children.map(($6) => $6 === parameters ? newParameters : $6)
       };
     }
     return {
       type: "CallExpression",
       children: [
+        ws,
         makeLeftHandSideExpression(expression),
         {
           type: "Call",
@@ -2333,7 +2370,7 @@ ${body}`;
       ref = makeRef("$");
       inplacePrepend(ref, body);
     }
-    if (startsWithPredicate(body, ($5) => $5.type === "ObjectExpression")) {
+    if (startsWithPredicate(body, ($7) => $7.type === "ObjectExpression")) {
       body = makeLeftHandSideExpression(body);
     }
     const parameters = makeNode({
@@ -3523,7 +3560,7 @@ ${body}`;
   function len2(arr, length) {
     return arr.length === length;
   }
-  function processAssignmentDeclaration(decl, pattern, suffix, ws, assign, e) {
+  function processAssignmentDeclaration(decl, pattern, typeSuffix, ws, assign, e) {
     decl = {
       ...decl,
       $loc: {
@@ -3535,7 +3572,7 @@ ${body}`;
     splices = splices.map((s) => [", ", s]);
     const thisAssignments = assignments.map((a) => ["", a, ";"]);
     if ("typeSuffix" in pattern) {
-      suffix ??= pattern.typeSuffix;
+      typeSuffix ??= pattern.typeSuffix;
     }
     const initializer = makeNode({
       type: "Initializer",
@@ -3547,9 +3584,9 @@ ${body}`;
       pattern,
       initializer,
       splices,
-      suffix,
+      typeSuffix,
       thisAssignments,
-      children: [pattern, suffix, initializer]
+      children: [pattern, typeSuffix, initializer]
     });
     const children = [decl, binding];
     return makeNode({
@@ -3566,9 +3603,9 @@ ${body}`;
     gatherRecursiveAll(statements, ($) => $.type === "Declaration").forEach((statement) => {
       const { bindings } = statement;
       return bindings?.forEach((binding) => {
-        const suffix = binding.suffix;
-        if (suffix && suffix.optional && suffix.t) {
-          convertOptionalType(suffix);
+        const { typeSuffix } = binding;
+        if (typeSuffix && typeSuffix.optional && typeSuffix.t) {
+          convertOptionalType(typeSuffix);
         }
         const { initializer } = binding;
         if (initializer) {
@@ -3649,8 +3686,8 @@ ${body}`;
     }
     const { decl, bindings } = condition.declaration;
     const binding = bindings[0];
-    let { pattern, suffix, initializer } = binding;
-    const nullCheck = suffix?.optional && !suffix.t && !suffix.nonnull;
+    let { pattern, typeSuffix, initializer } = binding;
+    const nullCheck = typeSuffix?.optional && !typeSuffix.t && !typeSuffix.nonnull;
     if (!(initializer != null)) {
       condition.children = [
         {
@@ -3688,14 +3725,14 @@ ${body}`;
       if (nullCheck) {
         children.unshift("(");
         children.push(") != null");
-        suffix = void 0;
+        typeSuffix = void 0;
       }
       Object.assign(condition, {
         type: "AssignmentExpression",
         children,
         hoistDec: !simple ? {
           type: "Declaration",
-          children: ["let ", ref, suffix],
+          children: ["let ", ref, typeSuffix],
           names: []
         } : void 0,
         pattern,
@@ -3703,7 +3740,7 @@ ${body}`;
       });
     }
     updateParentPointers(condition, parent);
-    rootCondition.blockPrefix = getPatternBlockPrefix(pattern, ref, decl, suffix);
+    rootCondition.blockPrefix = getPatternBlockPrefix(pattern, ref, decl, typeSuffix);
   }
   function processDeclarationConditions(node) {
     gatherRecursiveAll(
@@ -3805,9 +3842,6 @@ ${body}`;
           }
         } else {
           const block = blockWithPrefix(blockPrefix, s.then);
-          if (block.bare && e && !block.semicolon) {
-            block.children.push(block.semicolon = ";");
-          }
           s.children = s.children.map(($2) => $2 === s.then ? block : $2);
           s.then = block;
           updateParentPointers(s);
@@ -4084,6 +4118,10 @@ ${body}`;
           };
           pre = pre.slice(0, -1);
         } else {
+          let m;
+          if (m = firstNonSpace(exp), typeof m === "string" && /^[ \t]*\n/.test(m) || typeof m === "object" && m != null && "token" in m && typeof m.token === "string" && /^[ \t]*\n/.test(m.token)) {
+            exp = parenthesizeExpression(exp);
+          }
           exp = {
             type: "AwaitExpression",
             children: [...last.children, exp]
@@ -4099,6 +4137,77 @@ ${body}`;
       children: [...pre, exp, post]
     };
   }
+  function processUnaryNestedExpression(pre, args, post) {
+    const isArray = args.type === "ArrayExpression";
+    if (!isArray) {
+      args = stripTrailingImplicitComma(args);
+    }
+    if (isArray || args.length > 2) {
+      const last = pre[pre.length - 1];
+      if (!(typeof last === "object" && last != null && "type" in last && last.type === "Await")) {
+        return;
+      }
+      if (last.op) {
+        if (!isArray) {
+          args = {
+            type: "ArrayExpression",
+            children: ["[", args, "]"]
+          };
+        }
+      } else {
+        pre.pop();
+        if (!isArray) {
+          args = args;
+          args = {
+            type: "ArrayExpression",
+            children: [
+              "[",
+              ...(() => {
+                const results = [];
+                for (let i = 0, len3 = args.length; i < len3; i++) {
+                  const arg = args[i];
+                  if (typeof arg === "object" && arg != null && "type" in arg && arg.type === "Argument") {
+                    const expression = processUnaryExpression([last], arg.expression);
+                    results.push({
+                      ...arg,
+                      expression,
+                      children: arg.children.map(($) => $ === arg.expression ? expression : $)
+                    });
+                  } else {
+                    results.push(arg);
+                  }
+                }
+                return results;
+              })(),
+              "]"
+            ]
+          };
+        } else {
+          args = trimFirstSpace(args);
+          args = {
+            ...args,
+            children: args.children.map(
+              (arg) => {
+                if (typeof arg === "object" && arg != null && "type" in arg && arg.type === "ArrayElement" && "expression" in arg && "children" in arg) {
+                  const { type, expression: exp, children } = arg;
+                  let expression = processUnaryExpression([last], trimFirstSpace(exp));
+                  expression = prepend(getTrimmingSpace(exp), expression);
+                  return {
+                    ...arg,
+                    expression,
+                    children: children.map(($1) => $1 === exp ? expression : $1)
+                  };
+                } else {
+                  return arg;
+                }
+              }
+            )
+          };
+        }
+      }
+    }
+    return processUnaryExpression(pre, args, post);
+  }
 
   // source/parser/pipe.civet
   function constructInvocation(fn, arg) {
@@ -4136,36 +4245,31 @@ ${body}`;
     };
   }
   function constructPipeStep(fn, arg, returning) {
+    if (!returning) {
+      returning = null;
+    }
     let children = [[fn.leadingComment, fn.expr, fn.trailingComment].map(skipIfOnlyWS), " ", arg];
     switch (fn.expr.token) {
-      case "yield":
-      case "await":
-        if (fn.expr.op) {
-          children = processUnaryExpression([fn.expr], arg, void 0);
-        }
-        if (returning) {
-          return [
-            children,
-            returning
-          ];
-        }
+      case "await": {
+        children = processUnaryExpression([fn.expr], arg, void 0);
+      }
+      case "yield": {
         return [
           children,
-          null
+          returning
         ];
-      case "return":
+      }
+      case "return": {
         return [{
           type: "ReturnStatement",
           children
         }, null];
+      }
     }
-    if (returning) {
-      return [
-        constructInvocation(fn, arg),
-        returning
-      ];
-    }
-    return [constructInvocation(fn, arg), null];
+    return [
+      constructInvocation(fn, arg),
+      returning
+    ];
   }
   function processPipelineExpressions(statements) {
     gatherRecursiveAll(statements, (n) => n.type === "PipelineExpression").forEach((s) => {
@@ -4422,7 +4526,29 @@ ${body}`;
         message: "'own' is only meaningful in for..in loops"
       };
     }
-    if (!declaration2 && !own) {
+    const { binding } = declaration;
+    let pattern = binding?.pattern;
+    if (binding?.typeSuffix || inOf.token === "in" && declaration2 && pattern.type !== "Identifier") {
+      const itemRef = makeRef(inOf.token === "in" ? "key" : "item");
+      blockPrefix.push(["", {
+        type: "Declaration",
+        children: [declaration, " = ", itemRef],
+        names: declaration.names
+      }, ";"]);
+      pattern = itemRef;
+      declaration = {
+        type: "ForDeclaration",
+        binding: {
+          type: "Binding",
+          pattern,
+          children: [pattern],
+          names: []
+        },
+        children: ["const ", itemRef],
+        names: []
+      };
+    }
+    if (!(declaration2 || own)) {
       return {
         declaration,
         blockPrefix,
@@ -4461,29 +4587,6 @@ ${body}`;
             children: [" ", expRef2, " =", exp]
           };
         }
-        const { binding } = declaration;
-        let { pattern } = binding;
-        if (!(pattern.type === "Identifier")) {
-          const keyRef = makeRef("key");
-          blockPrefix.push(["", [
-            declaration,
-            " = ",
-            keyRef
-          ], ";"]);
-          pattern = keyRef;
-          declaration = {
-            type: "ForDeclaration",
-            binding: {
-              type: "Binding",
-              pattern,
-              children: [pattern],
-              names: [],
-              suffix: binding.suffix
-            },
-            children: ["const ", keyRef],
-            names: []
-          };
-        }
         if (own) {
           const hasPropRef = getRef("hasProp");
           blockPrefix.push(["", ["if (!", hasPropRef, "(", insertTrimmingSpace(expRef2, ""), ", ", insertTrimmingSpace(pattern, ""), ")) continue"], ";"]);
@@ -4516,7 +4619,8 @@ ${body}`;
   function findDecs(statements) {
     const declarations = gatherNodes(statements, ($) => $.type === "Declaration");
     const declarationNames = declarations.flatMap((d) => d.names);
-    return new Set(declarationNames);
+    const globals = getConfig().globals || [];
+    return new Set(globals.concat(declarationNames));
   }
   function createConstLetDecs(statements, scopes, letOrConst) {
     function findVarDecs(statements2, decs) {
@@ -5383,7 +5487,7 @@ ${js}`
   function expressionizeTypeIf([ifOp, condition, t, e]) {
     const children = [
       "(",
-      insertTrimmingSpace(condition, ""),
+      trimFirstSpace(condition),
       "?"
     ];
     if (!xor(ifOp.negated, condition.negated)) {
@@ -5566,7 +5670,7 @@ ${js}`
             [name, value] = [value, name];
           }
           if (!suppressPrefix) {
-            value = prefix.concat(insertTrimmingSpace(value, ""));
+            value = prefix.concat(trimFirstSpace(value));
           }
           if (wValue)
             value.unshift(wValue);
@@ -5792,7 +5896,7 @@ ${js}`
           if (part.name.type === "ComputedPropertyName") {
             rest.push(part);
           } else {
-            parts.push([part.name, "={", insertTrimmingSpace(part.value, ""), "}"]);
+            parts.push([part.name, "={", trimFirstSpace(part.value), "}"]);
           }
           break;
         case "SpreadProperty":
@@ -5817,7 +5921,7 @@ ${js}`
   }
   function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "get" }, autoReturn = true) {
     const { token } = kind;
-    ws = insertTrimmingSpace(ws, "");
+    ws = trimFirstSpace(ws);
     let setVal;
     const parameters = token === "get" ? {
       type: "Parameters",
@@ -6178,37 +6282,85 @@ ${js}`
     }
   }
   function processTypes(node) {
-    return gatherRecursiveAll(node, (n) => n.type === "UnaryType").forEach((unary) => {
-      let last;
-      let count = 0;
-      let ref10;
-      while (unary.suffix.length && (ref10 = unary.suffix)[ref10.length - 1]?.token === "?") {
-        last = unary.suffix.pop();
-        count++;
-      }
-      if (!count) {
+    return gatherRecursiveAll(node, (n) => n.type === "TypeUnary").forEach((unary) => {
+      if (!unary.suffix.length) {
         return;
       }
-      if (unary.parent?.type === "TypeTuple") {
-        if (count === 1) {
-          unary.suffix.push(last);
-          return;
+      let ref10;
+      let m3;
+      if (m3 = (ref10 = unary.suffix)[ref10.length - 1], typeof m3 === "object" && m3 != null && "token" in m3 && m3.token === "?") {
+        const { token } = m3;
+        let last;
+        let count = 0;
+        let ref11;
+        while (unary.suffix.length && (ref11 = unary.suffix)[ref11.length - 1]?.token === "?") {
+          last = unary.suffix.pop();
+          count++;
         }
-        replaceNode(unary, [
-          getTrimmingSpace(unary),
-          "(",
-          parenthesizeType(insertTrimmingSpace(unary, "")),
-          " | null)",
-          last
-        ]);
-      } else {
-        replaceNode(unary, [
-          getTrimmingSpace(unary),
-          "(",
-          parenthesizeType(insertTrimmingSpace(unary, "")),
-          count === 1 ? " | undefined" : " | undefined | null",
-          ")"
-        ]);
+        let ref12;
+        while (unary.suffix.length && (ref12 = unary.suffix)[ref12.length - 1]?.type === "NonNullAssertion") {
+          unary.suffix.pop();
+        }
+        let ref13;
+        if (unary.suffix.length || unary.prefix.length)
+          ref13 = unary;
+        else
+          ref13 = unary.t;
+        const t = ref13;
+        if (unary.parent?.type === "TypeTuple") {
+          if (count === 1) {
+            unary.suffix.push(last);
+            return;
+          }
+          replaceNode(unary, [
+            getTrimmingSpace(unary),
+            "(",
+            parenthesizeType(trimFirstSpace(t)),
+            " | null)",
+            last
+          ]);
+        } else {
+          replaceNode(unary, {
+            type: "TypeParenthesized",
+            ts: true,
+            children: [
+              getTrimmingSpace(unary),
+              "(",
+              parenthesizeType(trimFirstSpace(t)),
+              count === 1 ? " | undefined" : " | undefined | null",
+              ")"
+            ]
+          });
+        }
+      } else if (typeof m3 === "object" && m3 != null && "type" in m3 && m3.type === "NonNullAssertion") {
+        const { type } = m3;
+        let ref14;
+        while (unary.suffix.length && (ref14 = unary.suffix)[ref14.length - 1]?.type === "NonNullAssertion") {
+          unary.suffix.pop();
+        }
+        let ref15;
+        while (unary.suffix.length && (ref15 = unary.suffix)[ref15.length - 1]?.token === "?") {
+          unary.suffix.pop();
+        }
+        const t = trimFirstSpace(
+          unary.suffix.length || unary.prefix.length ? unary : unary.t
+        );
+        const args = {
+          type: "TypeArguments",
+          ts: true,
+          types: [t],
+          children: ["<", t, ">"]
+        };
+        replaceNode(unary, {
+          type: "TypeIdentifier",
+          raw: "NonNullable",
+          args,
+          children: [
+            getTrimmingSpace(unary),
+            "NonNullable",
+            args
+          ]
+        });
       }
     });
   }
@@ -6216,11 +6368,11 @@ ${js}`
     gatherRecursiveAll(statements, ($7) => $7.type === "StatementExpression").forEach((_exp) => {
       const exp = _exp;
       const { statement } = exp;
-      let ref11;
+      let ref16;
       switch (statement.type) {
         case "IfStatement": {
-          if (ref11 = expressionizeIfStatement(statement)) {
-            const expression = ref11;
+          if (ref16 = expressionizeIfStatement(statement)) {
+            const expression = ref16;
             return replaceNode(statement, expression, exp);
           } else {
             return replaceNode(statement, wrapIIFE([["", statement]]), exp);
@@ -6366,10 +6518,10 @@ ${js}`
           if (type === "IfStatement") {
             liftedIfs.add(ancestor2);
           }
-          let m3;
           let m4;
+          let m5;
           return type === "Call" || // Block, except for if/else blocks when condition already lifted
-          type === "BlockStatement" && !((m3 = ancestor2.parent, typeof m3 === "object" && m3 != null && "type" in m3 && m3.type === "IfStatement") && liftedIfs.has(ancestor2.parent)) && !((m4 = ancestor2.parent, typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "ElseClause" && "parent" in m4 && typeof m4.parent === "object" && m4.parent != null && "type" in m4.parent && m4.parent.type === "IfStatement") && liftedIfs.has(ancestor2.parent.parent)) || type === "PipelineExpression" || // Declaration
+          type === "BlockStatement" && !((m4 = ancestor2.parent, typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "IfStatement") && liftedIfs.has(ancestor2.parent)) && !((m5 = ancestor2.parent, typeof m5 === "object" && m5 != null && "type" in m5 && m5.type === "ElseClause" && "parent" in m5 && typeof m5.parent === "object" && m5.parent != null && "type" in m5.parent && m5.parent.type === "IfStatement") && liftedIfs.has(ancestor2.parent.parent)) || type === "PipelineExpression" || // Declaration
           type === "Initializer" || // Right-hand side of assignment
           type === "AssignmentExpression" && findChildIndex(ancestor2, child2) === ancestor2.children.indexOf(ancestor2.expression) || type === "ReturnStatement" || type === "YieldExpression";
         }));
@@ -6448,8 +6600,8 @@ ${js}`
       for (let i4 = 0, len3 = placeholders.length; i4 < len3; i4++) {
         const placeholder = placeholders[i4];
         typeSuffix ??= placeholder.typeSuffix;
-        let ref12;
-        replaceNode((ref12 = placeholder.children)[ref12.length - 1], ref);
+        let ref17;
+        replaceNode((ref17 = placeholder.children)[ref17.length - 1], ref);
       }
       const { parent } = ancestor;
       const body = maybeUnwrap(ancestor);
@@ -6466,16 +6618,16 @@ ${js}`
         }
         case "PipelineExpression": {
           const i = findChildIndex(parent, ancestor);
-          let ref13;
+          let ref18;
           if (i === 1) {
-            ref13 = ancestor === parent.children[i];
+            ref18 = ancestor === parent.children[i];
           } else if (i === 2) {
-            ref13 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
+            ref18 = ancestor === parent.children[i][findChildIndex(parent.children[i], ancestor)][3];
           } else {
-            ref13 = void 0;
+            ref18 = void 0;
           }
           ;
-          outer = ref13;
+          outer = ref18;
           break;
         }
         case "AssignmentExpression":
@@ -6490,9 +6642,9 @@ ${js}`
         fnExp = makeLeftHandSideExpression(fnExp);
       }
       replaceNode(ancestor, fnExp, parent);
-      let ref14;
-      if (ref14 = getTrimmingSpace(body)) {
-        const ws = ref14;
+      let ref19;
+      if (ref19 = getTrimmingSpace(body)) {
+        const ws = ref19;
         inplaceInsertTrimmingSpace(body, "");
         inplacePrepend(ws, fnExp);
       }
@@ -6537,8 +6689,8 @@ ${js}`
         }
       ];
     }
-    let ref15;
-    if (Array.isArray(rest.delim) && (ref15 = rest.delim)[ref15.length - 1]?.token === ",") {
+    let ref20;
+    if (Array.isArray(rest.delim) && (ref20 = rest.delim)[ref20.length - 1]?.token === ",") {
       rest.delim = rest.delim.slice(0, -1);
       rest.children = [...rest.children.slice(0, -1), rest.delim];
     }
@@ -6703,6 +6855,7 @@ ${js}`
     NestedArgumentList,
     NestedArgument,
     SingleLineArgumentExpressions,
+    WArgumentPart,
     ArgumentPart,
     NonPipelineArgumentPart,
     BinaryOpExpression,
@@ -6714,6 +6867,8 @@ ${js}`
     UnaryExpression,
     UnaryWithoutParenthesizedAssignment,
     UnaryBody,
+    MaybeNestedCoffeeDoBody,
+    CoffeeDoBody,
     UnaryWithoutParenthesizedAssignmentBody,
     ParenthesizedAssignment,
     UnaryPostfix,
@@ -7046,6 +7201,7 @@ ${js}`
     MaybeNestedNonPipelineExtendedExpression,
     MaybeNestedPostfixedExpression,
     MaybeNestedExtendedExpression,
+    NestedExtendedExpression,
     MaybeParenNestedExtendedExpression,
     ImportDeclaration,
     ImpliedImport,
@@ -7302,6 +7458,7 @@ ${js}`
     NamespaceDeclaration,
     OptionalEquals,
     TypeLexicalDeclaration,
+    TypeLetOrConstDeclaration,
     TypeDeclarationBinding,
     InterfaceExtendsClause,
     InterfaceExtendsTarget,
@@ -7795,7 +7952,7 @@ ${js}`
   var $R91 = (0, import_lib3.$R)(new RegExp("#![^\\r\\n]*", "suy"));
   var $R92 = (0, import_lib3.$R)(new RegExp("[\\t ]*", "suy"));
   var $R93 = (0, import_lib3.$R)(new RegExp("[\\s]*", "suy"));
-  var $R94 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+  var $R94 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?", "suy"));
   var $R95 = (0, import_lib3.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
   var $R96 = (0, import_lib3.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
   var $R97 = (0, import_lib3.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
@@ -7986,9 +8143,7 @@ ${js}`
     var close = $5;
     if (skipImplicitArguments(args))
       return $skip;
-    let last = args[args.length - 1];
-    if (last?.token === "," && last.implicit)
-      args = args.slice(0, -1);
+    args = stripTrailingImplicitComma(args);
     return {
       type: "Call",
       args,
@@ -8166,24 +8321,43 @@ ${js}`
     var args = $2;
     var comma = $3;
     let [arg0, ...rest] = args;
-    arg0 = [indent, ...arg0];
+    arg0 = prepend(indent, arg0);
     return [arg0, ...rest, comma];
   });
   function NestedArgument(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "NestedArgument", NestedArgument$0);
   }
-  var SingleLineArgumentExpressions$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), ArgumentPart), (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), Comma), (0, import_lib3.$S)((0, import_lib3.$E)(_), ArgumentPart)))), function($skip, $loc, $0, $1, $2) {
+  var SingleLineArgumentExpressions$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(WArgumentPart, (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$S)((0, import_lib3.$E)(_), Comma), WArgumentPart))), function($skip, $loc, $0, $1, $2) {
     return [$1, ...$2.flat()];
   });
   function SingleLineArgumentExpressions(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "SingleLineArgumentExpressions", SingleLineArgumentExpressions$0);
   }
-  var ArgumentPart$0 = (0, import_lib3.$S)(DotDotDot, ExtendedExpression);
+  var WArgumentPart$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), ArgumentPart), function($skip, $loc, $0, $1, $2) {
+    return prepend($1, $2);
+  });
+  function WArgumentPart(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "WArgumentPart", WArgumentPart$0);
+  }
+  var ArgumentPart$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2) {
+    var spread = $1;
+    var expression = $2;
+    return {
+      type: "Argument",
+      children: $0,
+      expression,
+      spread
+    };
+  });
   var ArgumentPart$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(ExtendedExpression, (0, import_lib3.$E)(DotDotDot)), function($skip, $loc, $0, $1, $2) {
-    if ($2) {
-      return [$2, $1];
-    }
-    return $1;
+    var expression = $1;
+    var spread = $2;
+    return {
+      type: "Argument",
+      children: spread ? [spread, expression] : [expression],
+      expression,
+      spread
+    };
   });
   var ArgumentPart$$ = [ArgumentPart$0, ArgumentPart$1];
   function ArgumentPart(ctx, state2) {
@@ -8271,17 +8445,18 @@ ${js}`
   function RHS(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "RHS", RHS$$);
   }
-  var UnaryExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Q)(UnaryOp), UnaryBody, (0, import_lib3.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
+  var UnaryExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(IndentedApplicationAllowed, (0, import_lib3.$P)(UnaryOp), (0, import_lib3.$C)(ArrayLiteral, NestedArgumentList), (0, import_lib3.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var pre = $2;
+    var args = $3;
+    var post = $4;
+    return processUnaryNestedExpression(pre, args, post) ?? $skip;
+  });
+  var UnaryExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Q)(UnaryOp), UnaryBody, (0, import_lib3.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
     var pre = $1;
     var exp = $2;
     var post = $3;
     return processUnaryExpression(pre, exp, post);
   });
-  var UnaryExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(CoffeeDoEnabled, Do, __, (0, import_lib3.$C)(ArrowFunction, (0, import_lib3.$S)(LeftHandSideExpression, (0, import_lib3.$N)((0, import_lib3.$S)(__, AssignmentOpSymbol))), ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4) {
-    var ws = $3;
-    var exp = $4;
-    return processCoffeeDo(ws, exp);
-  });
   var UnaryExpression$$ = [UnaryExpression$0, UnaryExpression$1];
   function UnaryExpression(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "UnaryExpression", UnaryExpression$$);
@@ -8295,14 +8470,35 @@ ${js}`
   function UnaryWithoutParenthesizedAssignment(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "UnaryWithoutParenthesizedAssignment", UnaryWithoutParenthesizedAssignment$0);
   }
-  var UnaryBody$0 = ParenthesizedAssignment;
-  var UnaryBody$1 = ExpressionizedStatementWithTrailingCallExpressions;
-  var UnaryBody$2 = UpdateExpression;
-  var UnaryBody$3 = NestedNonAssignmentExtendedExpression;
-  var UnaryBody$$ = [UnaryBody$0, UnaryBody$1, UnaryBody$2, UnaryBody$3];
+  var UnaryBody$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(CoffeeDoEnabled, Do, MaybeNestedCoffeeDoBody), function($skip, $loc, $0, $1, $2, $3) {
+    var body = $3;
+    return processCoffeeDo(...body);
+  });
+  var UnaryBody$1 = ParenthesizedAssignment;
+  var UnaryBody$2 = ExpressionizedStatementWithTrailingCallExpressions;
+  var UnaryBody$3 = UpdateExpression;
+  var UnaryBody$4 = NestedNonAssignmentExtendedExpression;
+  var UnaryBody$$ = [UnaryBody$0, UnaryBody$1, UnaryBody$2, UnaryBody$3, UnaryBody$4];
   function UnaryBody(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "UnaryBody", UnaryBody$$);
   }
+  var MaybeNestedCoffeeDoBody$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, CoffeeDoBody)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    if (!$2)
+      return $skip;
+    return $2;
+  });
+  var MaybeNestedCoffeeDoBody$1 = (0, import_lib3.$S)((0, import_lib3.$E)(_), CoffeeDoBody);
+  var MaybeNestedCoffeeDoBody$$ = [MaybeNestedCoffeeDoBody$0, MaybeNestedCoffeeDoBody$1];
+  function MaybeNestedCoffeeDoBody(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedCoffeeDoBody", MaybeNestedCoffeeDoBody$$);
+  }
+  var CoffeeDoBody$0 = ArrowFunction;
+  var CoffeeDoBody$1 = (0, import_lib3.$S)(LeftHandSideExpression, (0, import_lib3.$N)((0, import_lib3.$S)(__, AssignmentOpSymbol)));
+  var CoffeeDoBody$2 = ExtendedExpression;
+  var CoffeeDoBody$$ = [CoffeeDoBody$0, CoffeeDoBody$1, CoffeeDoBody$2];
+  function CoffeeDoBody(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "CoffeeDoBody", CoffeeDoBody$$);
+  }
   var UnaryWithoutParenthesizedAssignmentBody$0 = UpdateExpression;
   var UnaryWithoutParenthesizedAssignmentBody$1 = ExpressionizedStatementWithTrailingCallExpressions;
   var UnaryWithoutParenthesizedAssignmentBody$2 = NestedNonAssignmentExtendedExpression;
@@ -8501,7 +8697,7 @@ ${js}`
   var ArrowFunction$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Async, _)), ArrowParameters, (0, import_lib3.$E)(ReturnTypeSuffix), FatArrow, FatArrowBody), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var async = $1;
     var parameters = $2;
-    var suffix = $3;
+    var returnType = $3;
     var arrow = $4;
     var expOrBlock = $5;
     if (!async)
@@ -8512,13 +8708,13 @@ ${js}`
         modifier: {
           async: !!async.length
         },
-        returnType: suffix
+        returnType
       },
       parameters,
-      returnType: suffix,
+      returnType,
       async,
       block: expOrBlock,
-      children: [async, parameters, suffix, arrow, expOrBlock]
+      children: [async, parameters, returnType, arrow, expOrBlock]
     };
   });
   var ArrowFunction$$ = [ArrowFunction$0, ArrowFunction$1];
@@ -10250,7 +10446,7 @@ ${js}`
     var wid = $4;
     var w = $5;
     var parameters = $6;
-    var suffix = $7;
+    var returnType = $7;
     if (!async)
       async = [];
     if (!generator)
@@ -10261,7 +10457,7 @@ ${js}`
       id,
       name: id?.name,
       parameters,
-      returnType: suffix,
+      returnType,
       async,
       generator,
       modifier: {
@@ -10269,7 +10465,7 @@ ${js}`
         generator: !!generator.length
       },
       block: null,
-      children: !parameters.implicit ? [async, func, generator, wid, w, parameters, suffix] : [async, func, generator, wid, parameters, w, suffix]
+      children: !parameters.implicit ? [async, func, generator, wid, w, parameters, returnType] : [async, func, generator, wid, parameters, w, returnType]
       // move whitespace w to after implicit () in parameters
     };
   });
@@ -10468,7 +10664,7 @@ ${js}`
     var behavior = $7;
     var w2 = $8;
     var parameters = $9;
-    var suffix = $10;
+    var returnType = $10;
     if (!async)
       async = [];
     if (!generator)
@@ -10483,7 +10679,7 @@ ${js}`
       id,
       name: id.name,
       parameters,
-      returnType: suffix,
+      returnType,
       async,
       generator,
       modifier: {
@@ -10491,7 +10687,7 @@ ${js}`
         generator: !!generator.length
       },
       block: null,
-      children: [async, func, generator, w1, id, w2, parameters, suffix],
+      children: [async, func, generator, w1, id, w2, parameters, returnType],
       behavior
     };
   });
@@ -10538,7 +10734,7 @@ ${js}`
   var ThinArrowFunction$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Async, _)), ArrowParameters, (0, import_lib3.$E)(ReturnTypeSuffix), (0, import_lib3.$E)(_), Arrow, NoCommaBracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var async = $1;
     var parameters = $2;
-    var suffix = $3;
+    var returnType = $3;
     var arrow = $5;
     var block = $6;
     if (!async)
@@ -10548,7 +10744,7 @@ ${js}`
       type: "FunctionExpression",
       id: void 0,
       parameters,
-      returnType: suffix,
+      returnType,
       async,
       generator,
       block,
@@ -10560,14 +10756,14 @@ ${js}`
           async: !!async.length,
           generator: !!generator.length
         },
-        returnType: suffix
+        returnType
       },
       children: [
         async,
         { $loc: arrow.$loc, token: "function" },
         generator,
         parameters,
-        suffix,
+        returnType,
         block
       ]
     };
@@ -11264,6 +11460,7 @@ ${js}`
     return {
       type: "SpreadElement",
       children: [ws, dots, exp],
+      expression: exp,
       names: exp.names
     };
   });
@@ -11275,12 +11472,14 @@ ${js}`
         return {
           type: "ArrayElement",
           children: [exp],
+          expression: exp,
           names: exp.names
         };
       } else {
         return {
           type: "SpreadElement",
           children: [...spread, exp],
+          expression: exp,
           names: exp.names
         };
       }
@@ -11324,9 +11523,9 @@ ${js}`
       // replace first space with bracket
       ...content[1].flat()
     ];
-    const last = content[content.length - 1];
+    let last = content[content.length - 1];
     if (last.children?.at(-1)?.implicit) {
-      last.children = last.children.slice(0, -1);
+      content[content.length - 1] = last = { ...last, children: last.children.slice(0, -1) };
     }
     return {
       type: "ArrayExpression",
@@ -12732,6 +12931,14 @@ ${js}`
       kind = { ...kind, token: "if" };
       condition = negateCondition(condition);
     }
+    if (block.bare && e) {
+      const semicolon = ";";
+      block = {
+        ...block,
+        semicolon,
+        children: [...block.children, semicolon]
+      };
+    }
     return {
       type: "IfStatement",
       children: [kind, ws, condition, block, e],
@@ -12745,6 +12952,13 @@ ${js}`
     var clause = $1;
     var block = $2;
     var e = $3;
+    if (block.bare && e) {
+      block = {
+        ...block,
+        semicolon: ";",
+        children: [...block.children, ";"]
+      };
+    }
     return {
       type: "IfStatement",
       children: [...clause.children, block, e],
@@ -13201,14 +13415,14 @@ ${js}`
   }
   var ForBinding$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(BindingPattern, BindingIdentifier), (0, import_lib3.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
     var pattern = $1;
-    var suffix = $2;
-    suffix ??= pattern.typeSuffix;
+    var typeSuffix = $2;
+    typeSuffix ??= pattern.typeSuffix;
     return {
       type: "Binding",
-      children: [pattern, suffix],
+      children: [pattern, typeSuffix],
       names: pattern.names,
       pattern,
-      suffix,
+      typeSuffix,
       splices: [],
       thisAssignments: []
     };
@@ -13845,6 +14059,16 @@ ${js}`
   function MaybeNestedExtendedExpression(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedExtendedExpression", MaybeNestedExtendedExpression$$);
   }
+  var NestedExtendedExpression$0 = NestedBulletedArray;
+  var NestedExtendedExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, ExtendedExpression)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    if ($3)
+      return $3;
+    return $skip;
+  });
+  var NestedExtendedExpression$$ = [NestedExtendedExpression$0, NestedExtendedExpression$1];
+  function NestedExtendedExpression(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "NestedExtendedExpression", NestedExtendedExpression$$);
+  }
   var MaybeParenNestedExtendedExpression$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(EOS), ExtendedExpression), function(value) {
     return value[1];
   });
@@ -14339,16 +14563,16 @@ ${js}`
   }
   var LexicalBinding$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(BindingPattern, (0, import_lib3.$E)(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
     var pattern = $1;
-    var suffix = $2;
+    var typeSuffix = $2;
     var initializer = $3;
     const [splices, thisAssignments] = gatherBindingCode(pattern);
-    suffix ??= pattern.typeSuffix;
+    typeSuffix ??= pattern.typeSuffix;
     return {
       type: "Binding",
-      children: [pattern, suffix, initializer],
+      children: [pattern, typeSuffix, initializer],
       names: pattern.names,
       pattern,
-      suffix,
+      typeSuffix,
       initializer,
       splices: splices.map((s) => [",", s]),
       thisAssignments: thisAssignments.map((s) => ["", s, ";"])
@@ -14356,14 +14580,14 @@ ${js}`
   });
   var LexicalBinding$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(BindingIdentifier, (0, import_lib3.$E)(TypeSuffix), (0, import_lib3.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
     var pattern = $1;
-    var suffix = $2;
+    var typeSuffix = $2;
     var initializer = $3;
     return {
       type: "Binding",
       children: $0,
       names: pattern.names,
       pattern,
-      suffix,
+      typeSuffix,
       initializer,
       splices: [],
       thisAssignments: []
@@ -16308,14 +16532,14 @@ ${js}`
   }
   var UsingBinding$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(BindingIdentifier, (0, import_lib3.$E)(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
     var pattern = $1;
-    var suffix = $2;
+    var typeSuffix = $2;
     var initializer = $3;
     return {
       type: "Binding",
       children: $0,
       names: pattern.names,
       pattern,
-      suffix,
+      typeSuffix,
       initializer,
       splices: [],
       thisAssignments: []
@@ -16421,7 +16645,17 @@ ${js}`
   function OptionalEquals(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "OptionalEquals", OptionalEquals$$);
   }
-  var TypeLexicalDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, LetOrConstOrVar, TypeDeclarationBinding, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, __, TypeDeclarationBinding))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypeLexicalDeclaration$0 = TypeLetOrConstDeclaration;
+  var TypeLexicalDeclaration$1 = (0, import_lib3.$S)(__, EnumDeclaration);
+  var TypeLexicalDeclaration$2 = ClassSignature;
+  var TypeLexicalDeclaration$3 = (0, import_lib3.$S)(Namespace, (0, import_lib3.$E)(_), IdentifierName, DeclareBlock);
+  var TypeLexicalDeclaration$4 = (0, import_lib3.$S)(Module, _, StringLiteral, (0, import_lib3.$E)(DeclareBlock));
+  var TypeLexicalDeclaration$5 = (0, import_lib3.$S)(Global, (0, import_lib3.$E)(DeclareBlock));
+  var TypeLexicalDeclaration$$ = [TypeLexicalDeclaration$0, TypeLexicalDeclaration$1, TypeLexicalDeclaration$2, TypeLexicalDeclaration$3, TypeLexicalDeclaration$4, TypeLexicalDeclaration$5];
+  function TypeLexicalDeclaration(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLexicalDeclaration", TypeLexicalDeclaration$$);
+  }
+  var TypeLetOrConstDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(__, LetOrConstOrVar, TypeDeclarationBinding, (0, import_lib3.$Q)((0, import_lib3.$S)(CommaDelimiter, __, TypeDeclarationBinding))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var first = $3;
     var rest = $4;
     const names = first.names.concat(...rest.map((b) => b[2].names));
@@ -16432,14 +16666,8 @@ ${js}`
       names
     };
   });
-  var TypeLexicalDeclaration$1 = (0, import_lib3.$S)(__, EnumDeclaration);
-  var TypeLexicalDeclaration$2 = ClassSignature;
-  var TypeLexicalDeclaration$3 = (0, import_lib3.$S)(Namespace, (0, import_lib3.$E)(_), IdentifierName, DeclareBlock);
-  var TypeLexicalDeclaration$4 = (0, import_lib3.$S)(Module, _, StringLiteral, (0, import_lib3.$E)(DeclareBlock));
-  var TypeLexicalDeclaration$5 = (0, import_lib3.$S)(Global, (0, import_lib3.$E)(DeclareBlock));
-  var TypeLexicalDeclaration$$ = [TypeLexicalDeclaration$0, TypeLexicalDeclaration$1, TypeLexicalDeclaration$2, TypeLexicalDeclaration$3, TypeLexicalDeclaration$4, TypeLexicalDeclaration$5];
-  function TypeLexicalDeclaration(ctx, state2) {
-    return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeLexicalDeclaration", TypeLexicalDeclaration$$);
+  function TypeLetOrConstDeclaration(ctx, state2) {
+    return (0, import_lib3.$EVENT)(ctx, state2, "TypeLetOrConstDeclaration", TypeLetOrConstDeclaration$0);
   }
   var TypeDeclarationBinding$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$C)(BindingPattern, BindingIdentifier), (0, import_lib3.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
     return {
@@ -16583,13 +16811,14 @@ ${js}`
   function NestedDeclareElement(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "NestedDeclareElement", NestedDeclareElement$0);
   }
-  var DeclareElement$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), (0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeLexicalDeclaration), function(value) {
+  var DeclareElement$0 = (0, import_lib3.$S)((0, import_lib3.$E)(Decorators), Export, __, Default, __, (0, import_lib3.$C)(Identifier, ClassSignature, InterfaceDeclaration));
+  var DeclareElement$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(Decorators), (0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeLexicalDeclaration), function(value) {
     return { "ts": true, "children": value };
   });
-  var DeclareElement$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeDeclarationRest), function(value) {
+  var DeclareElement$2 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Export, (0, import_lib3.$E)(_))), TypeDeclarationRest), function(value) {
     return { "ts": true, "children": value };
   });
-  var DeclareElement$$ = [DeclareElement$0, DeclareElement$1];
+  var DeclareElement$$ = [DeclareElement$0, DeclareElement$1, DeclareElement$2];
   function DeclareElement(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "DeclareElement", DeclareElement$$);
   }
@@ -16859,7 +17088,7 @@ ${js}`
     if (!prefix.length && !suffix.length)
       return t;
     return {
-      type: "UnaryType",
+      type: "TypeUnary",
       prefix,
       suffix,
       t,
@@ -16872,7 +17101,8 @@ ${js}`
   }
   var TypeUnarySuffix$0 = TypeIndexedAccess;
   var TypeUnarySuffix$1 = QuestionMark;
-  var TypeUnarySuffix$$ = [TypeUnarySuffix$0, TypeUnarySuffix$1];
+  var TypeUnarySuffix$2 = NonNullAssertion;
+  var TypeUnarySuffix$$ = [TypeUnarySuffix$0, TypeUnarySuffix$1, TypeUnarySuffix$2];
   function TypeUnarySuffix(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "TypeUnarySuffix", TypeUnarySuffix$$);
   }
@@ -16937,14 +17167,14 @@ ${js}`
   var TypePrimary$7 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), TypeLiteral), function($skip, $loc, $0, $1, $2) {
     var t = $2;
     return {
-      type: "LiteralType",
+      type: "TypeLiteral",
       t,
       children: $0
     };
   });
   var TypePrimary$8 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), UnknownAlias), function($skip, $loc, $0, $1, $2) {
     return {
-      type: "IdentifierType",
+      type: "TypeIdentifier",
       children: $0,
       raw: $2.token,
       args: void 0
@@ -16953,7 +17183,7 @@ ${js}`
   var TypePrimary$9 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), Identifier, (0, import_lib3.$Q)((0, import_lib3.$S)(Dot, IdentifierName)), (0, import_lib3.$E)((0, import_lib3.$C)(TypeArguments, ImplicitTypeArguments))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var args = $4;
     return {
-      type: "IdentifierType",
+      type: "TypeIdentifier",
       children: $0,
       raw: [$2.name, ...$3.map(([dot, id]) => dot.token + id.name)].join(""),
       args
@@ -16963,7 +17193,7 @@ ${js}`
     if (!$4)
       return $skip;
     return {
-      type: "ParenthesizedType",
+      type: "TypeParenthesized",
       children: [$1, $2, $4, $6, $7]
       // omit AllowAll/RestoreAll
     };
@@ -17329,16 +17559,20 @@ ${js}`
   }
   var TypeFunction$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)((0, import_lib3.$S)(Abstract, (0, import_lib3.$E)(_))), (0, import_lib3.$E)((0, import_lib3.$S)(New, (0, import_lib3.$E)(_))), Parameters, __, TypeArrowFunction, (0, import_lib3.$E)(ReturnType)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var type = $6;
-    const ret = [...$0];
+    const children = [...$0];
     if ($1 && !$2) {
-      ret[1] = {
+      children[1] = {
         type: "Error",
         message: "abstract function types must be constructors (abstract new)"
       };
     }
     if (!type)
-      ret.push("void");
-    return ret;
+      children.push("void");
+    return {
+      type: "TypeFunction",
+      children,
+      ts: true
+    };
   });
   function TypeFunction(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeFunction", TypeFunction$0);
@@ -17520,17 +17754,22 @@ ${js}`
   function CivetPrologueContent(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "CivetPrologueContent", CivetPrologueContent$0);
   }
-  var CivetOption$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R94, "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 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R94, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?/"), 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();
       return "";
     });
     let value = $3 ? $4 : $1 === "-" ? false : true;
-    if (optionName === "tab") {
-      value = parseFloat(value);
-      if (isNaN(value))
-        value = 0;
+    switch (optionName) {
+      case "tab":
+        value = parseFloat(value);
+        if (isNaN(value))
+          value = 0;
+        break;
+      case "globals":
+        value = value.split(",").filter(Boolean);
+        break;
     }
     return [optionName, value];
   });
@@ -17883,6 +18122,7 @@ ${js}`
       coffeeOf: false,
       coffeePrototype: false,
       defaultElement: "div",
+      globals: [],
       implicitReturns: true,
       jsxCode: false,
       objectIs: false,