@danielx/civet 0.8.5 → 0.8.7

package/CHANGELOG.md

@@ -4,6 +4,16 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.8.7 (2024-10-22, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.6...v0.8.7), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.7))
+* Fix one-line arrow functions with `@` arguments [[#1490](https://github.com/DanielXMoore/Civet/pull/1490)]
+* Fix `Promise<void>` detection with implicit type arguments [[#1491](https://github.com/DanielXMoore/Civet/pull/1491)]
+* Fix await with array member expression [[#1492](https://github.com/DanielXMoore/Civet/pull/1492)]
+
+## 0.8.6 (2024-10-21, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.5...v0.8.6), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.6))
+* Fix CLI with complex `NODE_OPTIONS`, LSP cleanup [[#1482](https://github.com/DanielXMoore/Civet/pull/1482)]
+* `if` conditions continued by binary op on next line [[#1483](https://github.com/DanielXMoore/Civet/pull/1483)]
+* `from ... import/export` (reversed `import`/`export`) [[#1484](https://github.com/DanielXMoore/Civet/pull/1484)]
+
 ## 0.8.5 (2024-10-21, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.4...v0.8.5), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.5))
 * Reverse slices and inequality slices with implicit parts [[#1478](https://github.com/DanielXMoore/Civet/pull/1478)]
 * Indented types after binary type operators [[#1479](https://github.com/DanielXMoore/Civet/pull/1479)]

package/dist/browser.js

@@ -547,6 +547,7 @@ ${body}`;
     hasImportDeclaration: () => hasImportDeclaration,
     hasYield: () => hasYield,
     insertTrimmingSpace: () => insertTrimmingSpace,
+    isComma: () => isComma,
     isEmptyBareBlock: () => isEmptyBareBlock,
     isFunction: () => isFunction,
     isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
@@ -2344,11 +2345,21 @@ ${js}`
   }
 
   // source/parser/function.civet
+  function getTypeArguments(args) {
+    while (typeof args === "object" && args != null && "args" in args) {
+      args = args.args;
+    }
+    if (!Array.isArray(args)) {
+      throw new Error("getTypeArguments could not find relevant array");
+    }
+    return args.filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "TypeArgument");
+  }
   function isVoidType(t) {
-    return t?.type === "TypeLiteral" && t.t.type === "VoidType";
+    return typeof t === "object" && t != null && "type" in t && t.type === "TypeLiteral" && "t" in t && typeof t.t === "object" && t.t != null && "type" in t.t && t.t.type === "VoidType";
   }
   function isPromiseVoidType(t) {
-    return t?.type === "TypeIdentifier" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
+    let args;
+    return typeof t === "object" && t != null && "type" in t && t.type === "TypeIdentifier" && "raw" in t && t.raw === "Promise" && (args = getTypeArguments(t.args?.args)).length === 1 && isVoidType(args[0].t);
   }
   function implicitFunctionBlock(f) {
     if (f.abstract || f.block || f.signature?.optional)
@@ -2934,7 +2945,7 @@ ${js}`
     if (isConstructor) {
       const { ancestor } = findAncestor(f, ($5) => $5.type === "ClassExpression");
       if (ancestor != null) {
-        const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($6) => $6.type === "FieldDefinition").map(($7) => $7.id).filter((a) => typeof a === "object" && a != null && "type" in a && a.type === "Identifier").map(($8) => $8.name));
+        const fields = new Set(gatherRecursiveWithinFunction(ancestor, ($6) => $6.type === "FieldDefinition").map(($7) => $7.id).filter((a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "Identifier").map(($8) => $8.name));
         const classExpressions = ancestor.body.expressions;
         let index = findChildIndex(classExpressions, f);
         assert.notEqual(index, -1, "Could not find constructor in class");
@@ -2986,10 +2997,10 @@ ${js}`
     if (isConstructor) {
       const superCalls = gatherNodes(
         expressions,
-        (a1) => typeof a1 === "object" && a1 != null && "type" in a1 && a1.type === "CallExpression" && "children" in a1 && Array.isArray(a1.children) && a1.children.length >= 1 && typeof a1.children[0] === "object" && a1.children[0] != null && "token" in a1.children[0] && a1.children[0].token === "super"
+        (a2) => typeof a2 === "object" && a2 != null && "type" in a2 && a2.type === "CallExpression" && "children" in a2 && Array.isArray(a2.children) && a2.children.length >= 1 && typeof a2.children[0] === "object" && a2.children[0] != null && "token" in a2.children[0] && a2.children[0].token === "super"
       );
       if (superCalls.length) {
-        const { child } = findAncestor(superCalls[0], (a2) => a2 === block);
+        const { child } = findAncestor(superCalls[0], (a3) => a3 === block);
         const index = findChildIndex(expressions, child);
         if (index < 0) {
           throw new Error("Could not find super call within top-level expressions");
@@ -2999,6 +3010,7 @@ ${js}`
       }
     }
     expressions.unshift(...prefix);
+    braceBlock(block);
   }
   function processSignature(f) {
     const { block, signature } = f;
@@ -3121,11 +3133,11 @@ ${js}`
                 parameter = {
                   ...parameter,
                   initializer: void 0,
-                  children: parameter.children.filter((a3) => a3 !== initializer)
+                  children: parameter.children.filter((a4) => a4 !== initializer)
                 };
               } else {
                 args.push(parameter.children.filter(
-                  (a4) => a4 !== parameter.typeSuffix
+                  (a5) => a5 !== parameter.typeSuffix
                 ));
               }
             }
@@ -3198,7 +3210,7 @@ ${js}`
     }
     if (gatherRecursiveWithinFunction(
       block,
-      (a5) => a5 === ref
+      (a6) => a6 === ref
     ).length > 1) {
       fn.ampersandBlock = false;
     }
@@ -7757,6 +7769,8 @@ ${js}`
     NamedImports,
     OperatorNamedImports,
     FromClause,
+    ImpliedFromClause,
+    ImpliedFrom,
     ImportAssertion,
     TypeAndImportSpecifier,
     ImportSpecifier,
@@ -8093,6 +8107,7 @@ ${js}`
     NestedTypeArgumentList,
     NestedTypeArgument,
     SingleLineTypeArgumentList,
+    WTypeArgument,
     TypeArgumentDelimited,
     TypeArgument,
     TypeArgumentDelimiter,
@@ -8441,7 +8456,7 @@ ${js}`
   var $R29 = (0, import_lib4.$R)(new RegExp("[:.]", "suy"));
   var $R30 = (0, import_lib4.$R)(new RegExp("(?=for|if|loop|unless|until|while)", "suy"));
   var $R31 = (0, import_lib4.$R)(new RegExp("(?=loop|comptime|do|for|until|while)", "suy"));
-  var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s]+', "suy"));
+  var $R32 = (0, import_lib4.$R)(new RegExp('[^;"\\s=>]+', "suy"));
   var $R33 = (0, import_lib4.$R)(new RegExp("(?=[0-9.])", "suy"));
   var $R34 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)n", "suy"));
   var $R35 = (0, import_lib4.$R)(new RegExp("(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))", "suy"));
@@ -8954,10 +8969,10 @@ ${js}`
   function RHS(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "RHS", RHS$$);
   }
-  var UnaryExpression$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(IndentedApplicationAllowed, (0, import_lib4.$P)(UnaryOp), (0, import_lib4.$C)(ArrayLiteral, NestedArgumentList), (0, import_lib4.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var UnaryExpression$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(IndentedApplicationAllowed, (0, import_lib4.$P)(UnaryOp), (0, import_lib4.$C)(ArrayLiteral, NestedArgumentList), (0, import_lib4.$N)(CallExpressionRest), (0, import_lib4.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var pre = $2;
     var args = $3;
-    var post = $4;
+    var post = $5;
     return processUnaryNestedExpression(pre, args, post) ?? $skip;
   });
   var UnaryExpression$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$Q)(UnaryOp), UnaryBody, (0, import_lib4.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3) {
@@ -9950,14 +9965,22 @@ ${js}`
   var CallExpression$1 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, _, NamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     return dynamizeImportDeclarationExpression($0);
   });
-  var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var CallExpression$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(FromClause, __, Import, _, NamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var from = $1;
+    var fws = $2;
+    var i = $3;
+    var iws = $4;
+    var imports = $5;
+    return dynamizeImportDeclarationExpression([i, iws, imports, fws, from]);
+  });
+  var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$EXPECT)($L15, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var rest = $3;
     return processCallMemberExpression({
       type: "CallExpression",
       children: [$1, ...$2, ...rest.flat()]
     });
   });
-  var CallExpression$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var CallExpression$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib4.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
     var member = $1;
     var trailing = $2;
     var rest = $3;
@@ -9970,7 +9993,7 @@ ${js}`
     }
     return member;
   });
-  var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3];
+  var CallExpression$$ = [CallExpression$0, CallExpression$1, CallExpression$2, CallExpression$3, CallExpression$4];
   function CallExpression(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "CallExpression", CallExpression$$);
   }
@@ -14000,9 +14023,12 @@ ${js}`
   function ForBinding(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "ForBinding", ForBinding$0);
   }
-  var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, (0, import_lib4.$C)(EmptyCondition, Condition), CaseBlock), function($skip, $loc, $0, $1, $2, $3) {
-    var condition = $2;
-    var caseBlock = $3;
+  var SwitchStatement$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Switch, ForbidNewlineBinaryOp, (0, import_lib4.$E)((0, import_lib4.$C)(EmptyCondition, Condition)), RestoreNewlineBinaryOp, CaseBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var s = $1;
+    var condition = $3;
+    var caseBlock = $5;
+    if (!condition)
+      return $skip;
     if (condition.type === "EmptyCondition") {
       caseBlock.clauses.forEach(({ cases }) => {
         if (cases) {
@@ -14022,7 +14048,8 @@ ${js}`
     }
     return {
       type: "SwitchStatement",
-      children: $0,
+      children: [s, condition, caseBlock],
+      // omit NewlineBinaryOp control
       condition,
       caseBlock
     };
@@ -14390,8 +14417,8 @@ ${js}`
   function SingleLineExpressionWithIndentedApplicationForbidden(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "SingleLineExpressionWithIndentedApplicationForbidden", SingleLineExpressionWithIndentedApplicationForbidden$0);
   }
-  var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, ForbidNewlineBinaryOp, (0, import_lib4.$E)(Expression), RestoreNewlineBinaryOp, RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-    var exp = $4;
+  var ExpressionWithObjectApplicationForbidden$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(ForbidBracedApplication, ForbidIndentedApplication, (0, import_lib4.$E)(Expression), RestoreBracedApplication, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var exp = $3;
     if (exp)
       return exp;
     return $skip;
@@ -14780,36 +14807,41 @@ ${js}`
       children: [imp, $0.slice(1)]
     };
   });
-  var ImportDeclaration$1 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, TypeKeyword, __, ImportClause, __, FromClause), function(value) {
-    var imports = value[4];
-    var from = value[6];
-    return { "type": "ImportDeclaration", "ts": true, "children": value, "imports": imports, "from": from };
-  });
-  var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
-    var behavior = $4;
-    var imports = $6;
-    var from = $8;
+  var ImportDeclaration$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$S)(Import, __), ImpliedImport), Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var i = $1;
+    var behavior = $3;
+    var ws1 = $4;
+    var imports = $5;
+    var ws2 = $6;
+    var from = $7;
     imports.specifiers.forEach((spec) => {
       state.operators.set(spec.binding.name, spec.behavior ?? behavior);
     });
     return {
       type: "ImportDeclaration",
-      children: [$1, $2, trimFirstSpace($5), imports, $7, from],
-      // omit $3 = Operator and $4 = OperatorBehavior
+      children: [i, trimFirstSpace(ws1), imports, ws2, from],
+      // omit $2 = Operator and $3 = OperatorBehavior
       imports,
       from
     };
   });
-  var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ImportClause, __, FromClause), function(value) {
-    var imports = value[2];
-    var from = value[4];
-    return { "type": "ImportDeclaration", "children": value, "imports": imports, "from": from };
+  var ImportDeclaration$2 = (0, import_lib4.$TS)((0, import_lib4.$S)(Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var t = $3;
+    var imports = $4;
+    var from = $6;
+    return {
+      type: "ImportDeclaration",
+      children: $0,
+      imports,
+      from,
+      ts: !!t
+    };
   });
-  var ImportDeclaration$4 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
+  var ImportDeclaration$3 = (0, import_lib4.$T)((0, import_lib4.$S)(Import, __, ModuleSpecifier), function(value) {
     var module = value[2];
     return { "type": "ImportDeclaration", "children": value, "module": module };
   });
-  var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var ImportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var i = $1;
     var t = $2;
     var imports = $3;
@@ -14822,22 +14854,40 @@ ${js}`
     const children = [i, t, imports, w, from];
     return { type: "ImportDeclaration", ts: !!t, children, imports, from };
   });
-  var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedImport, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
-    var i = $1;
-    var behavior = $3;
-    var imports = $5;
-    var from = $7;
+  var ImportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, Operator, (0, import_lib4.$E)(OperatorBehavior), __, OperatorNamedImports), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var from = $1;
+    var fws = $2;
+    var i = $3;
+    var iws = $4;
+    var behavior = $6;
+    var ows = $7;
+    var imports = $8;
     imports.specifiers.forEach((spec) => {
       state.operators.set(spec.binding.name, spec.behavior ?? behavior);
     });
     return {
       type: "ImportDeclaration",
-      children: [$1, trimFirstSpace($4), imports, $6, from],
-      // omit $2 = Operator and $3 = OperatorBehavior
+      children: [i, iws, trimFirstSpace(ows), imports, fws, from],
+      // omit Operator and OperatorBehavior
       imports,
       from
     };
   });
+  var ImportDeclaration$6 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Import, __, (0, import_lib4.$E)((0, import_lib4.$S)(TypeKeyword, __)), ImportClause), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var from = $1;
+    var fws = $2;
+    var i = $3;
+    var iws = $4;
+    var t = $5;
+    var imports = $6;
+    return {
+      type: "ImportDeclaration",
+      children: [i, iws, t, imports, fws, from],
+      imports,
+      from,
+      ts: !!t
+    };
+  });
   var ImportDeclaration$$ = [ImportDeclaration$0, ImportDeclaration$1, ImportDeclaration$2, ImportDeclaration$3, ImportDeclaration$4, ImportDeclaration$5, ImportDeclaration$6];
   function ImportDeclaration(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "ImportDeclaration", ImportDeclaration$$);
@@ -14922,6 +14972,21 @@ ${js}`
   function FromClause(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "FromClause", FromClause$0);
   }
+  var ImpliedFromClause$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$C)((0, import_lib4.$S)(From, __), ImpliedFrom), ModuleSpecifier), function($skip, $loc, $0, $1, $2) {
+    var module = $2;
+    if (!Array.isArray(module))
+      return $0;
+    return [$1, ...module];
+  });
+  function ImpliedFromClause(ctx, state2) {
+    return (0, import_lib4.$EVENT)(ctx, state2, "ImpliedFromClause", ImpliedFromClause$0);
+  }
+  var ImpliedFrom$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($L0, 'ImpliedFrom ""'), function($skip, $loc, $0, $1) {
+    return { $loc, token: "from " };
+  });
+  function ImpliedFrom(ctx, state2) {
+    return (0, import_lib4.$EVENT)(ctx, state2, "ImpliedFrom", ImpliedFrom$0);
+  }
   var ImportAssertion$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), (0, import_lib4.$C)((0, import_lib4.$EXPECT)($L124, 'ImportAssertion "with"'), (0, import_lib4.$EXPECT)($L125, 'ImportAssertion "assert"')), NonIdContinue, (0, import_lib4.$E)(_), ObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var keyword = $2;
     var object = $5;
@@ -15054,7 +15119,7 @@ ${js}`
   function UnprocessedModuleSpecifier(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "UnprocessedModuleSpecifier", UnprocessedModuleSpecifier$$);
   }
-  var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s]+/'), function($skip, $loc, $0, $1) {
+  var UnquotedSpecifier$0 = (0, import_lib4.$TV)((0, import_lib4.$EXPECT)($R32, 'UnquotedSpecifier /[^;"\\s=>]+/'), function($skip, $loc, $0, $1) {
     var spec = $0;
     return { $loc, token: `"${spec}"` };
   });
@@ -15107,13 +15172,26 @@ ${js}`
     return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
   });
   var ExportDeclaration$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-    return { type: "ExportDeclaration", ts: $3.ts, children: $0 };
+    var exports = $3;
+    return { type: "ExportDeclaration", ts: exports.ts, children: $0 };
+  });
+  var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)(ImpliedFromClause, __, Export, __, ExportFromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var from = $1;
+    var fws = $2;
+    var e = $3;
+    var ews = $4;
+    var exports = $5;
+    return {
+      type: "ExportDeclaration",
+      ts: exports.ts,
+      children: [e, ews, exports, " ", from, trimFirstSpace(fws)]
+    };
   });
-  var ExportDeclaration$4 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ExportDeclaration$5 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(Decorators), Export, __, (0, import_lib4.$C)(Declaration, VariableStatement, TypeAndNamedExports, ExportVarDec)), function($skip, $loc, $0, $1, $2, $3, $4) {
     var declaration = $4;
     return { type: "ExportDeclaration", declaration, ts: declaration.ts, children: $0 };
   });
-  var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4];
+  var ExportDeclaration$$ = [ExportDeclaration$0, ExportDeclaration$1, ExportDeclaration$2, ExportDeclaration$3, ExportDeclaration$4, ExportDeclaration$5];
   function ExportDeclaration(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "ExportDeclaration", ExportDeclaration$$);
   }
@@ -18297,11 +18375,12 @@ ${js}`
   }
   var TypeArguments$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(OpenAngleBracket, (0, import_lib4.$P)((0, import_lib4.$S)(__, TypeArgumentDelimited)), __, CloseAngleBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
     var args = $2;
-    args = args.map(([ws, arg]) => [ws, ...arg]);
+    args = args.flatMap(([ws, [arg, delim]]) => [prepend(ws, arg), delim]);
+    args.pop();
     return {
       type: "TypeArguments",
       ts: true,
-      types: args.map(([, t]) => t),
+      args,
       children: $0
     };
   });
@@ -18313,10 +18392,15 @@ ${js}`
     var ws = $3;
     var args = $4;
     var close = $5;
-    let last = args[args.length - 1];
-    if (last?.token === ",")
+    const last = args[args.length - 1];
+    if (isComma(last))
       args = args.slice(0, -1);
-    return [open, ws, args, close];
+    return {
+      type: "TypeArguments",
+      ts: true,
+      args,
+      children: [open, ws, args, close]
+    };
   });
   function ImplicitTypeArguments(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "ImplicitTypeArguments", ImplicitTypeArguments$0);
@@ -18334,10 +18418,10 @@ ${js}`
   function ForbiddenImplicitTypeCalls(ctx, state2) {
     return (0, import_lib4.$EVENT_C)(ctx, state2, "ForbiddenImplicitTypeCalls", ForbiddenImplicitTypeCalls$$);
   }
-  var TypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$N)(EOS), TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$N)(EOS), (0, import_lib4.$E)(_), TypeArgument)), (0, import_lib4.$P)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$C)(NestedTypeBulletedTuple, NestedInterfaceBlock, NestedTypeArgumentList)))), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var TypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$N)(EOS), TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$N)(EOS), WTypeArgument)), (0, import_lib4.$P)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$C)(NestedTypeBulletedTuple, NestedInterfaceBlock, NestedTypeArgumentList)))), function($skip, $loc, $0, $1, $2, $3, $4) {
     return [
       $2,
-      ...$3.flatMap(([comma, eos, ws, arg]) => [comma, prepend(ws, arg)]),
+      ...$3.flatMap(([comma, eos, arg]) => [comma, arg]),
       ...$4.flatMap(
         ([comma, args]) => Array.isArray(args) ? [comma, ...args] : [comma, args]
       )
@@ -18352,10 +18436,10 @@ ${js}`
     ];
   });
   var TypeArgumentList$2 = NestedTypeArgumentList;
-  var TypeArgumentList$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, (0, import_lib4.$E)(_), TypeArgument))), function($skip, $loc, $0, $1, $2) {
+  var TypeArgumentList$3 = (0, import_lib4.$TS)((0, import_lib4.$S)(TypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)(CommaDelimiter, WTypeArgument))), function($skip, $loc, $0, $1, $2) {
     return [
       $1,
-      ...$2.flatMap(([comma, ws, arg]) => [comma, prepend(ws, arg)])
+      ...$2.flatMap(([comma, arg]) => [comma, arg])
     ];
   });
   var TypeArgumentList$$ = [TypeArgumentList$0, TypeArgumentList$1, TypeArgumentList$2, TypeArgumentList$3];
@@ -18382,17 +18466,25 @@ ${js}`
   function NestedTypeArgument(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "NestedTypeArgument", NestedTypeArgument$0);
   }
-  var SingleLineTypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$S)((0, import_lib4.$E)(_), TypeArgument), (0, import_lib4.$Q)((0, import_lib4.$S)((0, import_lib4.$S)((0, import_lib4.$E)(_), Comma), (0, import_lib4.$S)((0, import_lib4.$E)(_), TypeArgument)))), function($skip, $loc, $0, $1, $2) {
-    return [$1, ...$2.flat()];
+  var SingleLineTypeArgumentList$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(WTypeArgument, (0, import_lib4.$Q)((0, import_lib4.$S)((0, import_lib4.$S)((0, import_lib4.$E)(_), Comma), WTypeArgument))), function($skip, $loc, $0, $1, $2) {
+    return [$1, ...$2];
   });
   function SingleLineTypeArgumentList(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "SingleLineTypeArgumentList", SingleLineTypeArgumentList$0);
   }
+  var WTypeArgument$0 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib4.$E)(_), TypeArgument), function($skip, $loc, $0, $1, $2) {
+    return prepend($1, $2);
+  });
+  function WTypeArgument(ctx, state2) {
+    return (0, import_lib4.$EVENT)(ctx, state2, "WTypeArgument", WTypeArgument$0);
+  }
   var TypeArgumentDelimited$0 = (0, import_lib4.$S)(TypeArgument, TypeArgumentDelimiter);
   function TypeArgumentDelimited(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "TypeArgumentDelimited", TypeArgumentDelimited$0);
   }
-  var TypeArgument$0 = Type;
+  var TypeArgument$0 = (0, import_lib4.$T)(Type, function(value) {
+    return { "type": "TypeArgument", "ts": true, "t": value, "children": [value] };
+  });
   function TypeArgument(ctx, state2) {
     return (0, import_lib4.$EVENT)(ctx, state2, "TypeArgument", TypeArgument$0);
   }

package/dist/civet

@@ -90,7 +90,7 @@ async function parseArgs(args, isTTY = process.stdin.isTTY) {
         results.push(`-${char}`);
       }
       ;
-      args.splice(i, 1 + i - i, ...results);
+      args.splice(i, i + 1 - i, ...results);
       continue;
     }
     switch (arg) {
@@ -305,9 +305,6 @@ async function repl(args, options) {
       };
     } else {
       const execArgv = ["--experimental-vm-modules"];
-      if (process.env.NODE_OPTIONS) {
-        execArgv.push(process.env.NODE_OPTIONS);
-      }
       const { fork } = await import("node:child_process");
       fork(__filename, args, {
         execArgv,
@@ -650,9 +647,6 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
         }
         const debugRe = /--debug|--inspect/;
         const isDebug = typeof v8debug === "object" || debugRe.test(process.execArgv.join(" ")) || debugRe.test(process.env.NODE_OPTIONS ?? "");
-        if (process.env.NODE_OPTIONS) {
-          execArgv.push(process.env.NODE_OPTIONS);
-        }
         if (isDebug) {
           execArgv.push("--inspect=" + (process.debugPort + 1));
         }