@danielx/civet 0.8.14 → 0.8.15

package/dist/main.mjs

@@ -28,9 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js
+// node_modules/@danielx/hera/dist/machine.js
 var require_machine = __commonJS({
-  "node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+  "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -790,18 +790,31 @@ function insertTrimmingSpace(target, c) {
     if (target.length === 0) {
       return c;
     }
-    return target.map((e, i) => {
+    const results = [];
+    for (let i3 = 0, len3 = target.length; i3 < len3; i3++) {
+      const i = i3;
+      const e = target[i3];
       if (i === 0) {
-        return insertTrimmingSpace(e, c);
+        results.push(insertTrimmingSpace(e, c));
       } else {
-        return e;
+        results.push(e);
       }
-    });
+    }
+    ;
+    return results;
   } else if (isParent(target)) {
-    return {
+    const oldChildren = target.children;
+    target = {
       ...target,
       children: insertTrimmingSpace(target.children, c)
     };
+    for (const key in target) {
+      const i = oldChildren.indexOf(target[key]);
+      if (i >= 0) {
+        target[key] = target.children[i];
+      }
+    }
+    return target;
   } else if (isToken(target)) {
     return {
       ...target,
@@ -976,8 +989,8 @@ function startsWithPredicate(node, predicate, skip = isWhitespaceOrEmpty) {
     return void 0;
   }
   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];
       if (skip(child)) {
         continue;
       }
@@ -1016,9 +1029,9 @@ function deepCopy(root) {
       if (Array.isArray(node)) {
         const array = new Array(node.length);
         copied.set(node, array);
-        for (let i4 = 0, len4 = node.length; i4 < len4; i4++) {
-          const i = i4;
-          const item = node[i4];
+        for (let i5 = 0, len5 = node.length; i5 < len5; i5++) {
+          const i = i5;
+          const item = node[i5];
           array[i] = recurse(item);
         }
       } else if (node?.type === "Ref") {
@@ -1045,9 +1058,9 @@ function replaceNode(node, newNode, parent) {
     throw new Error("replaceNode failed: node has no parent");
   }
   function recurse(children) {
-    for (let i5 = 0, len5 = children.length; i5 < len5; i5++) {
-      const i = i5;
-      const child = children[i5];
+    for (let i6 = 0, len6 = children.length; i6 < len6; i6++) {
+      const i = i6;
+      const child = children[i6];
       if (child === node) {
         children[i] = newNode;
         return true;
@@ -1084,9 +1097,9 @@ function replaceNodes(root, predicate, replacer) {
       return root;
     }
   }
-  for (let i6 = 0, len6 = array.length; i6 < len6; i6++) {
-    const i = i6;
-    const node = array[i6];
+  for (let i7 = 0, len7 = array.length; i7 < len7; i7++) {
+    const i = i7;
+    const node = array[i7];
     if (!(node != null)) {
       return;
     }
@@ -1210,8 +1223,8 @@ function updateParentPointers(node, parent, depth = 1) {
     return;
   }
   if (Array.isArray(node)) {
-    for (let i7 = 0, len7 = node.length; i7 < len7; i7++) {
-      const child = node[i7];
+    for (let i8 = 0, len8 = node.length; i8 < len8; i8++) {
+      const child = node[i8];
       updateParentPointers(child, parent, depth);
     }
     return;
@@ -1221,8 +1234,8 @@ function updateParentPointers(node, parent, depth = 1) {
     node.parent = parent;
   }
   if (depth && isParent(node)) {
-    for (let ref5 = node.children, i8 = 0, len8 = ref5.length; i8 < len8; i8++) {
-      const child = ref5[i8];
+    for (let ref5 = node.children, i9 = 0, len9 = ref5.length; i9 < len9; i9++) {
+      const child = ref5[i9];
       updateParentPointers(child, node, depth - 1);
     }
   }
@@ -1398,9 +1411,9 @@ function wrapWithReturn(expression) {
 }
 function flatJoin(array, separator) {
   const result = [];
-  for (let i9 = 0, len9 = array.length; i9 < len9; i9++) {
-    const i = i9;
-    const items = array[i9];
+  for (let i10 = 0, len10 = array.length; i10 < len10; i10++) {
+    const i = i10;
+    const items = array[i10];
     if (i) {
       result.push(separator);
     }
@@ -5575,9 +5588,12 @@ function forRange(open, forDeclaration, range, stepExp, close) {
     ascDec = [", ", ascRef, " = ", startRef, " <= ", endRef];
   }
   let varAssign = [], varLetAssign = varAssign, varLet = varAssign, blockPrefix;
-  let names = forDeclaration?.names;
-  if (forDeclaration?.decl) {
-    if (forDeclaration.decl === "let") {
+  let names = forDeclaration?.names ?? [];
+  if (forDeclaration != null) {
+    if (forDeclaration.type === "AssignmentExpression") {
+      varAssign = varLetAssign = [forDeclaration, " = "];
+      names = [];
+    } else if (forDeclaration.decl === "let") {
       const varName = forDeclaration.children.splice(1);
       varAssign = [...trimFirstSpace(varName), " = "];
       varLet = [",", ...varName, " = ", counterRef];
@@ -5587,14 +5603,6 @@ function forRange(open, forDeclaration, range, stepExp, close) {
         ["", [forDeclaration, " = ", value], ";"]
       ];
     }
-  } else if (forDeclaration) {
-    assert.equal(
-      forDeclaration.type,
-      "AssignmentExpression",
-      "Internal error: Coffee-style for loop must be an assignment expression"
-    );
-    varAssign = varLetAssign = [forDeclaration, " = "];
-    names = [];
   }
   const declaration = {
     type: "Declaration",
@@ -6114,7 +6122,8 @@ function addPostfixStatement(statement, ws, post) {
   const block = makeNode({
     type: "BlockStatement",
     children: [" { ", expressions, " }"],
-    expressions
+    expressions,
+    bare: false
   });
   const children = [...post.children, block];
   if (!isWhitespaceOrEmpty(ws))
@@ -7813,9 +7822,12 @@ var grammar = {
   ReservedBinary,
   ArgumentsWithTrailingMemberExpressions,
   TrailingMemberExpressions,
-  IndentedTrailingMemberExpression,
+  IndentedTrailingMemberExpressions,
+  NestedTrailingMemberExpression,
   AllowedTrailingMemberExpressions,
   TrailingCallExpressions,
+  IndentedTrailingCallExpressions,
+  NestedTrailingCallExpression,
   AllowedTrailingCallExpressions,
   CommaDelimiter,
   OptionalCommaDelimiter,
@@ -7873,6 +7885,7 @@ var grammar = {
   PipelineHeadItem,
   PipelineTailItem,
   PrimaryExpression,
+  OptimizedParenthesizedExpression,
   ParenthesizedExpression,
   Placeholder,
   PlaceholderTypeSuffix,
@@ -9060,7 +9073,7 @@ var NestedExpressionizedStatement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((
     return expression;
   return {
     type: "CallExpression",
-    children: [expression, ...trailing.flat()]
+    children: [expression, ...trailing]
   };
 });
 function NestedExpressionizedStatement(ctx, state2) {
@@ -9073,7 +9086,7 @@ var ExpressionizedStatementWithTrailingCallExpressions$0 = (0, import_lib2.$TS)(
     type: "CallExpression",
     children: [
       makeLeftHandSideExpression($1),
-      $2
+      ...$2
     ]
   };
 });
@@ -9165,7 +9178,7 @@ var ExplicitArguments$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, Al
 function ExplicitArguments(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ExplicitArguments", ExplicitArguments$0);
 }
-var ApplicationStart$0 = (0, import_lib2.$S)(IndentedApplicationAllowed, (0, import_lib2.$Y)((0, import_lib2.$S)(IndentedFurther, (0, import_lib2.$N)(IdentifierBinaryOp), (0, import_lib2.$N)(ReservedBinary))), (0, import_lib2.$N)(IndentedTrailingMemberExpression));
+var ApplicationStart$0 = (0, import_lib2.$S)(IndentedApplicationAllowed, (0, import_lib2.$Y)((0, import_lib2.$S)(IndentedFurther, (0, import_lib2.$N)(IdentifierBinaryOp), (0, import_lib2.$N)(ReservedBinary))), (0, import_lib2.$N)(IndentedTrailingMemberExpressions));
 var ApplicationStart$1 = (0, import_lib2.$S)((0, import_lib2.$N)(EOS), (0, import_lib2.$Y)((0, import_lib2.$S)(_, (0, import_lib2.$C)(BracedApplicationAllowed, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L1, 'ApplicationStart "{"'))), (0, import_lib2.$N)(ForbiddenImplicitCalls))));
 var ApplicationStart$$ = [ApplicationStart$0, ApplicationStart$1];
 function ApplicationStart(ctx, state2) {
@@ -9206,19 +9219,34 @@ var ArgumentsWithTrailingMemberExpressions$0 = (0, import_lib2.$TS)((0, import_l
 function ArgumentsWithTrailingMemberExpressions(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ArgumentsWithTrailingMemberExpressions", ArgumentsWithTrailingMemberExpressions$0);
 }
-var TrailingMemberExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(MemberExpressionRest), (0, import_lib2.$Q)(IndentedTrailingMemberExpression)), function($skip, $loc, $0, $1, $2) {
+var TrailingMemberExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(MemberExpressionRest), (0, import_lib2.$E)(IndentedTrailingMemberExpressions)), function($skip, $loc, $0, $1, $2) {
+  if (!$2)
+    return $1;
   return [...$1, ...$2];
 });
 function TrailingMemberExpressions(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TrailingMemberExpressions", TrailingMemberExpressions$0);
 }
-var IndentedTrailingMemberExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(IndentedAtLeast, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$EXPECT)($L6, 'IndentedTrailingMemberExpression "?"')), (0, import_lib2.$EXPECT)($L7, 'IndentedTrailingMemberExpression "."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R3, "IndentedTrailingMemberExpression /[0-9]/")))), MemberExpressionRest), function($skip, $loc, $0, $1, $2, $3) {
+var IndentedTrailingMemberExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$Q)(NestedTrailingMemberExpression), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  if (!$2.length)
+    return $skip;
+  return $2.flat();
+});
+var IndentedTrailingMemberExpressions$1 = (0, import_lib2.$TV)((0, import_lib2.$P)(NestedTrailingMemberExpression), function($skip, $loc, $0, $1) {
+  return $1.flat();
+});
+var IndentedTrailingMemberExpressions$$ = [IndentedTrailingMemberExpressions$0, IndentedTrailingMemberExpressions$1];
+function IndentedTrailingMemberExpressions(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "IndentedTrailingMemberExpressions", IndentedTrailingMemberExpressions$$);
+}
+var NestedTrailingMemberExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Nested, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$EXPECT)($L6, 'NestedTrailingMemberExpression "?"')), (0, import_lib2.$EXPECT)($L7, 'NestedTrailingMemberExpression "."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R3, "NestedTrailingMemberExpression /[0-9]/")))), (0, import_lib2.$P)(MemberExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
   var ws = $1;
-  var rest = $3;
-  return prepend(ws, rest);
+  var rests = $3;
+  const [first, ...rest] = rests;
+  return [prepend(ws, first), ...rest];
 });
-function IndentedTrailingMemberExpression(ctx, state2) {
-  return (0, import_lib2.$EVENT)(ctx, state2, "IndentedTrailingMemberExpression", IndentedTrailingMemberExpression$0);
+function NestedTrailingMemberExpression(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "NestedTrailingMemberExpression", NestedTrailingMemberExpression$0);
 }
 var AllowedTrailingMemberExpressions$0 = (0, import_lib2.$T)((0, import_lib2.$S)(TrailingMemberPropertyAllowed, TrailingMemberExpressions), function(value) {
   return value[1];
@@ -9228,10 +9256,37 @@ var AllowedTrailingMemberExpressions$$ = [AllowedTrailingMemberExpressions$0, Al
 function AllowedTrailingMemberExpressions(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "AllowedTrailingMemberExpressions", AllowedTrailingMemberExpressions$$);
 }
-var TrailingCallExpressions$0 = (0, import_lib2.$P)((0, import_lib2.$S)(IndentedAtLeast, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$EXPECT)($L6, 'TrailingCallExpressions "?"')), (0, import_lib2.$EXPECT)($L7, 'TrailingCallExpressions "."'), (0, import_lib2.$N)((0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R3, "TrailingCallExpressions /[0-9]/"))))), (0, import_lib2.$P)(CallExpressionRest)));
+var TrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)(CallExpressionRest), (0, import_lib2.$E)(IndentedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2) {
+  if (!$1.length && !$2)
+    return $skip;
+  if (!$2)
+    return $1;
+  return [...$1, ...$2];
+});
 function TrailingCallExpressions(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TrailingCallExpressions", TrailingCallExpressions$0);
 }
+var IndentedTrailingCallExpressions$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(PushIndent, (0, import_lib2.$Q)(NestedTrailingCallExpression), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+  if (!$2.length)
+    return $skip;
+  return $2.flat();
+});
+var IndentedTrailingCallExpressions$1 = (0, import_lib2.$TV)((0, import_lib2.$P)(NestedTrailingCallExpression), function($skip, $loc, $0, $1) {
+  return $1.flat();
+});
+var IndentedTrailingCallExpressions$$ = [IndentedTrailingCallExpressions$0, IndentedTrailingCallExpressions$1];
+function IndentedTrailingCallExpressions(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "IndentedTrailingCallExpressions", IndentedTrailingCallExpressions$$);
+}
+var NestedTrailingCallExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Nested, (0, import_lib2.$Y)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$EXPECT)($L6, 'NestedTrailingCallExpression "?"')), (0, import_lib2.$EXPECT)($L7, 'NestedTrailingCallExpression "."'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R3, "NestedTrailingCallExpression /[0-9]/")))), (0, import_lib2.$P)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var ws = $1;
+  var rests = $3;
+  const [first, ...rest] = rests.flat();
+  return [prepend(ws, first), ...rest];
+});
+function NestedTrailingCallExpression(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "NestedTrailingCallExpression", NestedTrailingCallExpression$0);
+}
 var AllowedTrailingCallExpressions$0 = (0, import_lib2.$T)((0, import_lib2.$S)(TrailingMemberPropertyAllowed, TrailingCallExpressions), function(value) {
   return value[1];
 });
@@ -9835,7 +9890,7 @@ function PipelineExpressionBodySameLine(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "PipelineExpressionBodySameLine", PipelineExpressionBodySameLine$0);
 }
 var PipelineHeadItem$0 = NonPipelineExpression;
-var PipelineHeadItem$1 = ParenthesizedExpression;
+var PipelineHeadItem$1 = OptimizedParenthesizedExpression;
 var PipelineHeadItem$$ = [PipelineHeadItem$0, PipelineHeadItem$1];
 function PipelineHeadItem(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PipelineHeadItem", PipelineHeadItem$$);
@@ -9870,7 +9925,7 @@ var PrimaryExpression$5 = FunctionExpression;
 var PrimaryExpression$6 = IdentifierReference;
 var PrimaryExpression$7 = ClassExpression;
 var PrimaryExpression$8 = RegularExpressionLiteral;
-var PrimaryExpression$9 = ParenthesizedExpression;
+var PrimaryExpression$9 = OptimizedParenthesizedExpression;
 var PrimaryExpression$10 = Placeholder;
 var PrimaryExpression$11 = SymbolLiteral;
 var PrimaryExpression$12 = JSXImplicitFragment;
@@ -9878,31 +9933,36 @@ var PrimaryExpression$$ = [PrimaryExpression$0, PrimaryExpression$1, PrimaryExpr
 function PrimaryExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PrimaryExpression", PrimaryExpression$$);
 }
+var OptimizedParenthesizedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(ParenthesizedExpression), function($skip, $loc, $0, $1) {
+  const { expression } = $1;
+  switch (expression.type) {
+    case "StatementExpression":
+      if (expression.statement.type !== "IterationExpression")
+        break;
+    case "IterationExpression":
+      return expression;
+  }
+  return $1;
+});
+function OptimizedParenthesizedExpression(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "OptimizedParenthesizedExpression", OptimizedParenthesizedExpression$0);
+}
 var ParenthesizedExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(PostfixedCommaExpression, __, CloseParen)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
   var open = $1;
   if (!$3)
     return $skip;
-  const [exp, ws, close] = $3;
-  switch (exp.type) {
-    case "StatementExpression":
-      if (exp.statement.type !== "IterationExpression")
-        break;
-    case "IterationExpression":
-      return exp;
-    case "ParenthesizedExpression":
-      if (exp.implicit) {
-        return {
-          ...exp,
-          children: [open, exp.expression, ws, close],
-          implicit: false
-        };
-      }
-      break;
+  const [expression, ws, close] = $3;
+  if (expression.type === "ParenthesizedExpression" && expression.implicit) {
+    return {
+      ...expression,
+      children: [open, expression.expression, ws, close],
+      implicit: false
+    };
   }
   return {
     type: "ParenthesizedExpression",
-    children: [open, exp, ws, close],
-    expression: exp
+    children: [open, expression, ws, close],
+    expression
   };
 });
 function ParenthesizedExpression(ctx, state2) {
@@ -10440,15 +10500,15 @@ var CallExpression$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.
     children: [$1, ...$2, ...rest.flat()]
   });
 });
-var CallExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(MemberExpression, AllowedTrailingMemberExpressions, (0, import_lib2.$Q)(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+var CallExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(MemberExpression, (0, import_lib2.$Q)(CallExpressionRest), (0, import_lib2.$E)(AllowedTrailingCallExpressions)), function($skip, $loc, $0, $1, $2, $3) {
   var member = $1;
-  var trailing = $2;
-  var rest = $3;
-  if (rest.length || trailing.length) {
+  var rest = $2;
+  var trailing = $3;
+  if (rest.length || trailing) {
     rest = rest.flat();
     return processCallMemberExpression({
       type: "CallExpression",
-      children: [member, ...trailing, ...rest]
+      children: [member, ...rest, ...trailing ?? []]
     });
   }
   return member;
@@ -17763,7 +17823,7 @@ var InlineJSXPrimaryExpression$5 = ArrayLiteral;
 var InlineJSXPrimaryExpression$6 = BracedObjectLiteral;
 var InlineJSXPrimaryExpression$7 = IdentifierReference;
 var InlineJSXPrimaryExpression$8 = RegularExpressionLiteral;
-var InlineJSXPrimaryExpression$9 = ParenthesizedExpression;
+var InlineJSXPrimaryExpression$9 = OptimizedParenthesizedExpression;
 var InlineJSXPrimaryExpression$$ = [InlineJSXPrimaryExpression$0, InlineJSXPrimaryExpression$1, InlineJSXPrimaryExpression$2, InlineJSXPrimaryExpression$3, InlineJSXPrimaryExpression$4, InlineJSXPrimaryExpression$5, InlineJSXPrimaryExpression$6, InlineJSXPrimaryExpression$7, InlineJSXPrimaryExpression$8, InlineJSXPrimaryExpression$9];
 function InlineJSXPrimaryExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "InlineJSXPrimaryExpression", InlineJSXPrimaryExpression$$);
@@ -18929,7 +18989,7 @@ var TypeBullet$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(BulletIndent, (0, im
 function TypeBullet(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "TypeBullet", TypeBullet$0);
 }
-var TypeWithPostfix$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(TypeConditional, (0, import_lib2.$E)((0, import_lib2.$S)(SameLineOrIndentedFurther, TypeIfClause))), function($skip, $loc, $0, $1, $2) {
+var TypeWithPostfix$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(TypeConditional, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$E)(_), TypeIfClause))), function($skip, $loc, $0, $1, $2) {
   var t = $1;
   var postfix = $2;
   if (!postfix)

package/package.json

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