@danielx/civet 0.8.6 → 0.8.7

package/CHANGELOG.md

@@ -4,6 +4,11 @@ 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)]

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;
     }
@@ -8095,6 +8107,7 @@ ${js}`
     NestedTypeArgumentList,
     NestedTypeArgument,
     SingleLineTypeArgumentList,
+    WTypeArgument,
     TypeArgumentDelimited,
     TypeArgument,
     TypeArgumentDelimiter,
@@ -8956,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) {
@@ -18362,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
     };
   });
@@ -18378,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);
@@ -18399,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]
       )
@@ -18417,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];
@@ -18447,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/main.js

@@ -538,6 +538,7 @@ __export(lib_exports, {
   hasImportDeclaration: () => hasImportDeclaration,
   hasYield: () => hasYield,
   insertTrimmingSpace: () => insertTrimmingSpace,
+  isComma: () => isComma,
   isEmptyBareBlock: () => isEmptyBareBlock,
   isFunction: () => isFunction,
   isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
@@ -2320,11 +2321,21 @@ function serialize(value, context) {
 }
 
 // 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)
@@ -2910,7 +2921,7 @@ function processParams(f) {
   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");
@@ -2962,10 +2973,10 @@ function processParams(f) {
   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");
@@ -2975,6 +2986,7 @@ function processParams(f) {
     }
   }
   expressions.unshift(...prefix);
+  braceBlock(block);
 }
 function processSignature(f) {
   const { block, signature } = f;
@@ -3097,11 +3109,11 @@ function processCoffeeDo(ws, expression) {
               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
               ));
             }
           }
@@ -3174,7 +3186,7 @@ function makeAmpersandFunction(rhs) {
   }
   if (gatherRecursiveWithinFunction(
     block,
-    (a5) => a5 === ref
+    (a6) => a6 === ref
   ).length > 1) {
     fn.ampersandBlock = false;
   }
@@ -8071,6 +8083,7 @@ var grammar = {
   NestedTypeArgumentList,
   NestedTypeArgument,
   SingleLineTypeArgumentList,
+  WTypeArgument,
   TypeArgumentDelimited,
   TypeArgument,
   TypeArgumentDelimiter,
@@ -8932,10 +8945,10 @@ var RHS$$ = [RHS$0, RHS$1];
 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) {
@@ -18338,11 +18351,12 @@ function TypeArrowFunction(ctx, state2) {
 }
 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
   };
 });
@@ -18354,10 +18368,15 @@ var ImplicitTypeArguments$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(TypeAppli
   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);
@@ -18375,10 +18394,10 @@ var ForbiddenImplicitTypeCalls$$ = [ForbiddenImplicitTypeCalls$0, ForbiddenImpli
 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]
     )
@@ -18393,10 +18412,10 @@ var TypeArgumentList$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib
   ];
 });
 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];
@@ -18423,17 +18442,25 @@ var NestedTypeArgument$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Nested, Sing
 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/main.mjs

@@ -518,6 +518,7 @@ __export(lib_exports, {
   hasImportDeclaration: () => hasImportDeclaration,
   hasYield: () => hasYield,
   insertTrimmingSpace: () => insertTrimmingSpace,
+  isComma: () => isComma,
   isEmptyBareBlock: () => isEmptyBareBlock,
   isFunction: () => isFunction,
   isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
@@ -2300,11 +2301,21 @@ function serialize(value, context) {
 }
 
 // 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)
@@ -2890,7 +2901,7 @@ function processParams(f) {
   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");
@@ -2942,10 +2953,10 @@ function processParams(f) {
   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");
@@ -2955,6 +2966,7 @@ function processParams(f) {
     }
   }
   expressions.unshift(...prefix);
+  braceBlock(block);
 }
 function processSignature(f) {
   const { block, signature } = f;
@@ -3077,11 +3089,11 @@ function processCoffeeDo(ws, expression) {
               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
               ));
             }
           }
@@ -3154,7 +3166,7 @@ function makeAmpersandFunction(rhs) {
   }
   if (gatherRecursiveWithinFunction(
     block,
-    (a5) => a5 === ref
+    (a6) => a6 === ref
   ).length > 1) {
     fn.ampersandBlock = false;
   }
@@ -8051,6 +8063,7 @@ var grammar = {
   NestedTypeArgumentList,
   NestedTypeArgument,
   SingleLineTypeArgumentList,
+  WTypeArgument,
   TypeArgumentDelimited,
   TypeArgument,
   TypeArgumentDelimiter,
@@ -8912,10 +8925,10 @@ var RHS$$ = [RHS$0, RHS$1];
 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) {
@@ -18318,11 +18331,12 @@ function TypeArrowFunction(ctx, state2) {
 }
 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
   };
 });
@@ -18334,10 +18348,15 @@ var ImplicitTypeArguments$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(TypeAppli
   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);
@@ -18355,10 +18374,10 @@ var ForbiddenImplicitTypeCalls$$ = [ForbiddenImplicitTypeCalls$0, ForbiddenImpli
 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]
     )
@@ -18373,10 +18392,10 @@ var TypeArgumentList$1 = (0, import_lib4.$TS)((0, import_lib4.$S)((0, import_lib
   ];
 });
 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];
@@ -18403,17 +18422,25 @@ var NestedTypeArgument$0 = (0, import_lib4.$TS)((0, import_lib4.$S)(Nested, Sing
 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",