@danielx/civet 0.6.92 → 0.6.93

package/dist/browser.js

@@ -499,12 +499,32 @@ var Civet = (() => {
     return;
   }
   function isExit(node) {
-    return [
-      "ReturnStatement",
-      "ThrowStatement",
-      "BreakStatement",
-      "ContinueStatement"
-    ].includes(node?.type);
+    if (!(node != null)) {
+      return false;
+    }
+    switch (node.type) {
+      case "ReturnStatement":
+      case "ThrowStatement":
+      case "BreakStatement":
+      case "ContinueStatement": {
+        return true;
+      }
+      case "IfStatement": {
+        return isExit(node.then) && isExit(node.else?.at(-1));
+      }
+      case "BlockStatement": {
+        return isExit(node.expressions.at(-1)?.[1]);
+      }
+      case "IterationStatement": {
+        return node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true" && gatherRecursiveWithinFunction(
+          node.block,
+          ({ type }) => type === "BreakStatement"
+        ).length === 0;
+      }
+      default: {
+        return false;
+      }
+    }
   }
   function isComma(node) {
     if (node?.token === ",") {
@@ -634,12 +654,34 @@ var Civet = (() => {
     if (Array.isArray(node)) {
       return node.map(deepCopy);
     }
+    if (node?.type === "Ref")
+      return node;
     return Object.fromEntries(
       Object.entries(node).map(([key, value]) => {
         return [key, deepCopy(value)];
       })
     );
   }
+  function removeHoistDecs(node) {
+    if (node == null)
+      return;
+    if (typeof node !== "object")
+      return;
+    if ("hoistDec" in node) {
+      node.hoistDec = void 0;
+    }
+    if (Array.isArray(node)) {
+      for (const child of node) {
+        removeHoistDecs(child);
+      }
+      return;
+    }
+    if (node.children) {
+      for (const child of node.children) {
+        removeHoistDecs(child);
+      }
+    }
+  }
   function makeAmpersandFunction(bodyAfterRef = []) {
     const ref = makeRef("$");
     const body = [ref, ...bodyAfterRef];
@@ -1182,7 +1224,7 @@ var Civet = (() => {
   }
   function processBlocks(statements) {
     insertSemicolon(statements);
-    gatherRecursive(statements, ($) => $.type === "BlockStatement").forEach(function({ expressions }) {
+    gatherRecursive(statements, ($) => $.type === "BlockStatement").forEach(({ expressions }) => {
       return processBlocks(expressions);
     });
   }
@@ -1192,7 +1234,7 @@ var Civet = (() => {
       const i = i1;
       const s = statements[i1];
       if (i < l - 1) {
-        if (needsPrecedingSemicolon(statements[i + 1])) {
+        if (needsPrecedingSemicolon(statements[i + 1][1])) {
           const delim = s[2];
           if (!delim) {
             s[2] = ";";
@@ -1204,40 +1246,45 @@ var Civet = (() => {
     }
   }
   function needsPrecedingSemicolon(exp) {
-    let following;
-    if (Array.isArray(exp)) {
-      [, following] = exp;
-    } else {
-      following = exp;
+    if (!exp) {
+      return false;
     }
-    if (!following) {
+    if (Array.isArray(exp)) {
+      for (let i2 = 0, len1 = exp.length; i2 < len1; i2++) {
+        const child = exp[i2];
+        if (!(child != null)) {
+          continue;
+        }
+        return needsPrecedingSemicolon(child);
+      }
       return false;
     }
-    if (Array.isArray(following)) {
-      return needsPrecedingSemicolon(following[0]);
+    if (typeof exp === "string") {
+      return /^\s*[\(\[\`\+\-\/]/.test(exp);
     }
-    switch (following.type) {
+    switch (exp.type) {
       case "ParenthesizedExpression":
       case "ArrayExpression":
       case "ArrowFunction":
       case "TemplateLiteral":
       case "RegularExpressionLiteral":
-      case "RangeExpression": {
+      case "RangeExpression":
+      case "ComputedPropertyName": {
         return true;
       }
       case "AssignmentExpression": {
-        return startsWith(following, /^(\[|\()/);
+        return startsWith(exp, /^(\[|\()/);
       }
       case "Literal": {
-        return following.raw?.startsWith("-") || following.raw?.startsWith("+");
+        return exp.raw?.startsWith("-") || exp.raw?.startsWith("+");
       }
       case "PipelineExpression":
       case "UnwrappedExpression": {
-        return needsPrecedingSemicolon(following.children[1]);
+        return needsPrecedingSemicolon(exp.children[1]);
       }
       default: {
-        if (following.children) {
-          return needsPrecedingSemicolon(following.children[0]);
+        if (exp.children) {
+          return needsPrecedingSemicolon(exp.children);
         }
         ;
         return;
@@ -1376,8 +1423,7 @@ var Civet = (() => {
       const { clauses } = caseBlock;
       for (const c of clauses) {
         if (c.type === "WhenClause" && c.break) {
-          const last = c.block?.expressions?.at(-1)?.[1];
-          if (isExit(last)) {
+          if (isExit(c.block)) {
             c.children.splice(c.children.indexOf(c.break), 1);
             c.break = void 0;
           }
@@ -1936,10 +1982,16 @@ var Civet = (() => {
     if (!Array.isArray(node)) {
       return;
     }
-    let [, exp] = node;
+    let [, exp, semi] = node;
+    if (semi?.type === "SemicolonDelimiter") {
+      return;
+    }
     if (!exp) {
       return;
     }
+    if (isExit(exp)) {
+      return;
+    }
     const outer = exp;
     let { type } = exp;
     if (type === "LabelledStatement") {
@@ -2031,6 +2083,9 @@ var Civet = (() => {
     if (!exp) {
       return;
     }
+    if (isExit(exp)) {
+      return;
+    }
     const outer = exp;
     let { type } = exp;
     if (type === "LabelledStatement") {
@@ -2723,6 +2778,7 @@ var Civet = (() => {
                   switch (access.type) {
                     case "PropertyAccess":
                     case "SliceExpression":
+                    case "Index":
                       break;
                     default:
                       children.unshift({
@@ -2759,6 +2815,7 @@ var Civet = (() => {
               exp: children
             });
             arg = clone(arg);
+            removeHoistDecs(arg);
             if (arg.children[0].type === "Ref") {
               arg.children[0] = usingRef;
             }
@@ -4398,7 +4455,7 @@ var Civet = (() => {
       const exp = _exp;
       let { ancestor } = findAncestor(exp, ($4) => $4?.type === "Call");
       ancestor = ancestor?.parent;
-      while (ancestor?.parent?.type === "UnaryExpression") {
+      while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
         ancestor = ancestor.parent;
       }
       if (ancestor) {
@@ -6404,7 +6461,15 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "ArgumentsWithTrailingMemberExpressions", ArgumentsWithTrailingMemberExpressions$0);
       }
       var TrailingMemberExpressions$0 = $TS($S($Q(MemberExpressionRest), $Q($S(IndentedAtLeast, $Y($S($E($EXPECT($L6, 'TrailingMemberExpressions "?"')), $EXPECT($L7, 'TrailingMemberExpressions "."'), $N($EXPECT($R2, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
-        return $1.concat($2);
+        return $1.concat($2.map(([ws, , memberExpressionRest]) => {
+          if (Array.isArray(memberExpressionRest)) {
+            return [ws, ...memberExpressionRest];
+          }
+          return {
+            ...memberExpressionRest,
+            children: [ws, ...memberExpressionRest.children]
+          };
+        }));
       });
       function TrailingMemberExpressions(ctx, state) {
         return $EVENT(ctx, state, "TrailingMemberExpressions", TrailingMemberExpressions$0);
@@ -7123,19 +7188,25 @@ ${input.slice(result.pos)}
         return $EVENT(ctx, state, "ImplementsTarget", ImplementsTarget$0);
       }
       var ClassBody$0 = $TS($S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var elements = $3;
+        var expressions = $3;
+        if (!expressions)
+          expressions = $0[2] = [];
         return {
-          type: "ClassBody",
+          type: "BlockStatement",
+          subtype: "ClassBody",
           children: $0,
-          elements
+          expressions
         };
       });
       var ClassBody$1 = $TS($S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var elements = $2;
+        var expressions = $2;
+        if (!expressions)
+          expressions = $0[1] = [];
         return {
-          type: "ClassBody",
+          type: "BlockStatement",
+          subtype: "ClassBody",
           children: $0,
-          elements
+          expressions
         };
       });
       var ClassBody$$ = [ClassBody$0, ClassBody$1];
@@ -10746,6 +10817,7 @@ ${input.slice(result.pos)}
         var clause = $1;
         var block = $2;
         return {
+          ...clause,
           type: "IterationStatement",
           children: [...clause.children, block],
           block
@@ -10754,15 +10826,38 @@ ${input.slice(result.pos)}
       function LoopStatement(ctx, state) {
         return $EVENT(ctx, state, "LoopStatement", LoopStatement$0);
       }
-      var LoopClause$0 = $T($S(Loop), function(value) {
-        return { "type": "IterationStatement", "children": [value[0]] };
+      var LoopClause$0 = $TV(Loop, function($skip, $loc, $0, $1) {
+        var kind = $0;
+        const expression = {
+          type: "Literal",
+          children: ["true"],
+          raw: "true"
+        };
+        const condition = {
+          type: "ParenthesizedExpression",
+          children: ["(", expression, ")"],
+          expression
+        };
+        return {
+          type: "IterationStatement",
+          subtype: kind.token,
+          children: [kind, condition],
+          condition
+        };
       });
       function LoopClause(ctx, state) {
         return $EVENT(ctx, state, "LoopClause", LoopClause$0);
       }
-      var DoWhileStatement$0 = $T($S(Do, NoPostfixBracedBlock, __, WhileClause), function(value) {
-        var block = value[1];
-        return { "type": "IterationStatement", "children": value, "block": block };
+      var DoWhileStatement$0 = $TS($S(Do, NoPostfixBracedBlock, __, WhileClause), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var block = $2;
+        var clause = $4;
+        return {
+          ...clause,
+          type: "IterationStatement",
+          subtype: "do-while",
+          children: $0,
+          block
+        };
       });
       function DoWhileStatement(ctx, state) {
         return $EVENT(ctx, state, "DoWhileStatement", DoWhileStatement$0);
@@ -10801,6 +10896,7 @@ ${input.slice(result.pos)}
         }
         return {
           type: "IterationStatement",
+          subtype: kind.token,
           children: [kind, ws, condition],
           condition
         };
@@ -12925,7 +13021,7 @@ ${input.slice(result.pos)}
         return $EVENT_C(ctx, state, "LetOrConstOrVar", LetOrConstOrVar$$);
       }
       var Loop$0 = $TS($S($EXPECT($L167, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-        return { $loc, token: "while(true)" };
+        return { $loc, token: "while" };
       });
       function Loop(ctx, state) {
         return $EVENT(ctx, state, "Loop", Loop$0);
@@ -14431,7 +14527,7 @@ ${input.slice(result.pos)}
           "]"
         ];
       });
-      var TypeIndexedAccess$2 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+      var TypeIndexedAccess$2 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E($C(IdentifierName, LengthShorthand))), function($skip, $loc, $0, $1, $2, $3) {
         var p = $2;
         var id = $3;
         const open = { ...p, token: '["' };

package/dist/main.js

@@ -491,12 +491,32 @@ function isWhitespaceOrEmpty(node) {
   return;
 }
 function isExit(node) {
-  return [
-    "ReturnStatement",
-    "ThrowStatement",
-    "BreakStatement",
-    "ContinueStatement"
-  ].includes(node?.type);
+  if (!(node != null)) {
+    return false;
+  }
+  switch (node.type) {
+    case "ReturnStatement":
+    case "ThrowStatement":
+    case "BreakStatement":
+    case "ContinueStatement": {
+      return true;
+    }
+    case "IfStatement": {
+      return isExit(node.then) && isExit(node.else?.at(-1));
+    }
+    case "BlockStatement": {
+      return isExit(node.expressions.at(-1)?.[1]);
+    }
+    case "IterationStatement": {
+      return node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true" && gatherRecursiveWithinFunction(
+        node.block,
+        ({ type }) => type === "BreakStatement"
+      ).length === 0;
+    }
+    default: {
+      return false;
+    }
+  }
 }
 function isComma(node) {
   if (node?.token === ",") {
@@ -626,12 +646,34 @@ function deepCopy(node) {
   if (Array.isArray(node)) {
     return node.map(deepCopy);
   }
+  if (node?.type === "Ref")
+    return node;
   return Object.fromEntries(
     Object.entries(node).map(([key, value]) => {
       return [key, deepCopy(value)];
     })
   );
 }
+function removeHoistDecs(node) {
+  if (node == null)
+    return;
+  if (typeof node !== "object")
+    return;
+  if ("hoistDec" in node) {
+    node.hoistDec = void 0;
+  }
+  if (Array.isArray(node)) {
+    for (const child of node) {
+      removeHoistDecs(child);
+    }
+    return;
+  }
+  if (node.children) {
+    for (const child of node.children) {
+      removeHoistDecs(child);
+    }
+  }
+}
 function makeAmpersandFunction(bodyAfterRef = []) {
   const ref = makeRef("$");
   const body = [ref, ...bodyAfterRef];
@@ -1174,7 +1216,7 @@ function insertHoistDec(block, node, dec) {
 }
 function processBlocks(statements) {
   insertSemicolon(statements);
-  gatherRecursive(statements, ($) => $.type === "BlockStatement").forEach(function({ expressions }) {
+  gatherRecursive(statements, ($) => $.type === "BlockStatement").forEach(({ expressions }) => {
     return processBlocks(expressions);
   });
 }
@@ -1184,7 +1226,7 @@ function insertSemicolon(statements) {
     const i = i1;
     const s = statements[i1];
     if (i < l - 1) {
-      if (needsPrecedingSemicolon(statements[i + 1])) {
+      if (needsPrecedingSemicolon(statements[i + 1][1])) {
         const delim = s[2];
         if (!delim) {
           s[2] = ";";
@@ -1196,40 +1238,45 @@ function insertSemicolon(statements) {
   }
 }
 function needsPrecedingSemicolon(exp) {
-  let following;
-  if (Array.isArray(exp)) {
-    [, following] = exp;
-  } else {
-    following = exp;
+  if (!exp) {
+    return false;
   }
-  if (!following) {
+  if (Array.isArray(exp)) {
+    for (let i2 = 0, len1 = exp.length; i2 < len1; i2++) {
+      const child = exp[i2];
+      if (!(child != null)) {
+        continue;
+      }
+      return needsPrecedingSemicolon(child);
+    }
     return false;
   }
-  if (Array.isArray(following)) {
-    return needsPrecedingSemicolon(following[0]);
+  if (typeof exp === "string") {
+    return /^\s*[\(\[\`\+\-\/]/.test(exp);
   }
-  switch (following.type) {
+  switch (exp.type) {
     case "ParenthesizedExpression":
     case "ArrayExpression":
     case "ArrowFunction":
     case "TemplateLiteral":
     case "RegularExpressionLiteral":
-    case "RangeExpression": {
+    case "RangeExpression":
+    case "ComputedPropertyName": {
       return true;
     }
     case "AssignmentExpression": {
-      return startsWith(following, /^(\[|\()/);
+      return startsWith(exp, /^(\[|\()/);
     }
     case "Literal": {
-      return following.raw?.startsWith("-") || following.raw?.startsWith("+");
+      return exp.raw?.startsWith("-") || exp.raw?.startsWith("+");
     }
     case "PipelineExpression":
     case "UnwrappedExpression": {
-      return needsPrecedingSemicolon(following.children[1]);
+      return needsPrecedingSemicolon(exp.children[1]);
     }
     default: {
-      if (following.children) {
-        return needsPrecedingSemicolon(following.children[0]);
+      if (exp.children) {
+        return needsPrecedingSemicolon(exp.children);
       }
       ;
       return;
@@ -1368,8 +1415,7 @@ function processPatternMatching(statements, ReservedWord, getRef) {
     const { clauses } = caseBlock;
     for (const c of clauses) {
       if (c.type === "WhenClause" && c.break) {
-        const last = c.block?.expressions?.at(-1)?.[1];
-        if (isExit(last)) {
+        if (isExit(c.block)) {
           c.children.splice(c.children.indexOf(c.break), 1);
           c.break = void 0;
         }
@@ -1928,10 +1974,16 @@ function assignResults(node, collect) {
   if (!Array.isArray(node)) {
     return;
   }
-  let [, exp] = node;
+  let [, exp, semi] = node;
+  if (semi?.type === "SemicolonDelimiter") {
+    return;
+  }
   if (!exp) {
     return;
   }
+  if (isExit(exp)) {
+    return;
+  }
   const outer = exp;
   let { type } = exp;
   if (type === "LabelledStatement") {
@@ -2023,6 +2075,9 @@ function insertReturn(node, outerNode = node) {
   if (!exp) {
     return;
   }
+  if (isExit(exp)) {
+    return;
+  }
   const outer = exp;
   let { type } = exp;
   if (type === "LabelledStatement") {
@@ -2715,6 +2770,7 @@ function processPipelineExpressions(statements) {
                 switch (access.type) {
                   case "PropertyAccess":
                   case "SliceExpression":
+                  case "Index":
                     break;
                   default:
                     children.unshift({
@@ -2751,6 +2807,7 @@ function processPipelineExpressions(statements) {
             exp: children
           });
           arg = clone(arg);
+          removeHoistDecs(arg);
           if (arg.children[0].type === "Ref") {
             arg.children[0] = usingRef;
           }
@@ -4390,7 +4447,7 @@ function processPartialPlaceholders(statements) {
     const exp = _exp;
     let { ancestor } = findAncestor(exp, ($4) => $4?.type === "Call");
     ancestor = ancestor?.parent;
-    while (ancestor?.parent?.type === "UnaryExpression") {
+    while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
       ancestor = ancestor.parent;
     }
     if (ancestor) {
@@ -6396,7 +6453,15 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "ArgumentsWithTrailingMemberExpressions", ArgumentsWithTrailingMemberExpressions$0);
     }
     var TrailingMemberExpressions$0 = $TS($S($Q(MemberExpressionRest), $Q($S(IndentedAtLeast, $Y($S($E($EXPECT($L6, 'TrailingMemberExpressions "?"')), $EXPECT($L7, 'TrailingMemberExpressions "."'), $N($EXPECT($R2, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
-      return $1.concat($2);
+      return $1.concat($2.map(([ws, , memberExpressionRest]) => {
+        if (Array.isArray(memberExpressionRest)) {
+          return [ws, ...memberExpressionRest];
+        }
+        return {
+          ...memberExpressionRest,
+          children: [ws, ...memberExpressionRest.children]
+        };
+      }));
     });
     function TrailingMemberExpressions(ctx, state) {
       return $EVENT(ctx, state, "TrailingMemberExpressions", TrailingMemberExpressions$0);
@@ -7115,19 +7180,25 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "ImplementsTarget", ImplementsTarget$0);
     }
     var ClassBody$0 = $TS($S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var elements = $3;
+      var expressions = $3;
+      if (!expressions)
+        expressions = $0[2] = [];
       return {
-        type: "ClassBody",
+        type: "BlockStatement",
+        subtype: "ClassBody",
         children: $0,
-        elements
+        expressions
       };
     });
     var ClassBody$1 = $TS($S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var elements = $2;
+      var expressions = $2;
+      if (!expressions)
+        expressions = $0[1] = [];
       return {
-        type: "ClassBody",
+        type: "BlockStatement",
+        subtype: "ClassBody",
         children: $0,
-        elements
+        expressions
       };
     });
     var ClassBody$$ = [ClassBody$0, ClassBody$1];
@@ -10738,6 +10809,7 @@ var require_parser = __commonJS({
       var clause = $1;
       var block = $2;
       return {
+        ...clause,
         type: "IterationStatement",
         children: [...clause.children, block],
         block
@@ -10746,15 +10818,38 @@ var require_parser = __commonJS({
     function LoopStatement(ctx, state) {
       return $EVENT(ctx, state, "LoopStatement", LoopStatement$0);
     }
-    var LoopClause$0 = $T($S(Loop), function(value) {
-      return { "type": "IterationStatement", "children": [value[0]] };
+    var LoopClause$0 = $TV(Loop, function($skip, $loc, $0, $1) {
+      var kind = $0;
+      const expression = {
+        type: "Literal",
+        children: ["true"],
+        raw: "true"
+      };
+      const condition = {
+        type: "ParenthesizedExpression",
+        children: ["(", expression, ")"],
+        expression
+      };
+      return {
+        type: "IterationStatement",
+        subtype: kind.token,
+        children: [kind, condition],
+        condition
+      };
     });
     function LoopClause(ctx, state) {
       return $EVENT(ctx, state, "LoopClause", LoopClause$0);
     }
-    var DoWhileStatement$0 = $T($S(Do, NoPostfixBracedBlock, __, WhileClause), function(value) {
-      var block = value[1];
-      return { "type": "IterationStatement", "children": value, "block": block };
+    var DoWhileStatement$0 = $TS($S(Do, NoPostfixBracedBlock, __, WhileClause), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var block = $2;
+      var clause = $4;
+      return {
+        ...clause,
+        type: "IterationStatement",
+        subtype: "do-while",
+        children: $0,
+        block
+      };
     });
     function DoWhileStatement(ctx, state) {
       return $EVENT(ctx, state, "DoWhileStatement", DoWhileStatement$0);
@@ -10793,6 +10888,7 @@ var require_parser = __commonJS({
       }
       return {
         type: "IterationStatement",
+        subtype: kind.token,
         children: [kind, ws, condition],
         condition
       };
@@ -12917,7 +13013,7 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "LetOrConstOrVar", LetOrConstOrVar$$);
     }
     var Loop$0 = $TS($S($EXPECT($L167, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-      return { $loc, token: "while(true)" };
+      return { $loc, token: "while" };
     });
     function Loop(ctx, state) {
       return $EVENT(ctx, state, "Loop", Loop$0);
@@ -14423,7 +14519,7 @@ var require_parser = __commonJS({
         "]"
       ];
     });
-    var TypeIndexedAccess$2 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+    var TypeIndexedAccess$2 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E($C(IdentifierName, LengthShorthand))), function($skip, $loc, $0, $1, $2, $3) {
       var p = $2;
       var id = $3;
       const open = { ...p, token: '["' };

package/dist/main.mjs

@@ -489,12 +489,32 @@ function isWhitespaceOrEmpty(node) {
   return;
 }
 function isExit(node) {
-  return [
-    "ReturnStatement",
-    "ThrowStatement",
-    "BreakStatement",
-    "ContinueStatement"
-  ].includes(node?.type);
+  if (!(node != null)) {
+    return false;
+  }
+  switch (node.type) {
+    case "ReturnStatement":
+    case "ThrowStatement":
+    case "BreakStatement":
+    case "ContinueStatement": {
+      return true;
+    }
+    case "IfStatement": {
+      return isExit(node.then) && isExit(node.else?.at(-1));
+    }
+    case "BlockStatement": {
+      return isExit(node.expressions.at(-1)?.[1]);
+    }
+    case "IterationStatement": {
+      return node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true" && gatherRecursiveWithinFunction(
+        node.block,
+        ({ type }) => type === "BreakStatement"
+      ).length === 0;
+    }
+    default: {
+      return false;
+    }
+  }
 }
 function isComma(node) {
   if (node?.token === ",") {
@@ -624,12 +644,34 @@ function deepCopy(node) {
   if (Array.isArray(node)) {
     return node.map(deepCopy);
   }
+  if (node?.type === "Ref")
+    return node;
   return Object.fromEntries(
     Object.entries(node).map(([key, value]) => {
       return [key, deepCopy(value)];
     })
   );
 }
+function removeHoistDecs(node) {
+  if (node == null)
+    return;
+  if (typeof node !== "object")
+    return;
+  if ("hoistDec" in node) {
+    node.hoistDec = void 0;
+  }
+  if (Array.isArray(node)) {
+    for (const child of node) {
+      removeHoistDecs(child);
+    }
+    return;
+  }
+  if (node.children) {
+    for (const child of node.children) {
+      removeHoistDecs(child);
+    }
+  }
+}
 function makeAmpersandFunction(bodyAfterRef = []) {
   const ref = makeRef("$");
   const body = [ref, ...bodyAfterRef];
@@ -1172,7 +1214,7 @@ function insertHoistDec(block, node, dec) {
 }
 function processBlocks(statements) {
   insertSemicolon(statements);
-  gatherRecursive(statements, ($) => $.type === "BlockStatement").forEach(function({ expressions }) {
+  gatherRecursive(statements, ($) => $.type === "BlockStatement").forEach(({ expressions }) => {
     return processBlocks(expressions);
   });
 }
@@ -1182,7 +1224,7 @@ function insertSemicolon(statements) {
     const i = i1;
     const s = statements[i1];
     if (i < l - 1) {
-      if (needsPrecedingSemicolon(statements[i + 1])) {
+      if (needsPrecedingSemicolon(statements[i + 1][1])) {
         const delim = s[2];
         if (!delim) {
           s[2] = ";";
@@ -1194,40 +1236,45 @@ function insertSemicolon(statements) {
   }
 }
 function needsPrecedingSemicolon(exp) {
-  let following;
-  if (Array.isArray(exp)) {
-    [, following] = exp;
-  } else {
-    following = exp;
+  if (!exp) {
+    return false;
   }
-  if (!following) {
+  if (Array.isArray(exp)) {
+    for (let i2 = 0, len1 = exp.length; i2 < len1; i2++) {
+      const child = exp[i2];
+      if (!(child != null)) {
+        continue;
+      }
+      return needsPrecedingSemicolon(child);
+    }
     return false;
   }
-  if (Array.isArray(following)) {
-    return needsPrecedingSemicolon(following[0]);
+  if (typeof exp === "string") {
+    return /^\s*[\(\[\`\+\-\/]/.test(exp);
   }
-  switch (following.type) {
+  switch (exp.type) {
     case "ParenthesizedExpression":
     case "ArrayExpression":
     case "ArrowFunction":
     case "TemplateLiteral":
     case "RegularExpressionLiteral":
-    case "RangeExpression": {
+    case "RangeExpression":
+    case "ComputedPropertyName": {
       return true;
     }
     case "AssignmentExpression": {
-      return startsWith(following, /^(\[|\()/);
+      return startsWith(exp, /^(\[|\()/);
     }
     case "Literal": {
-      return following.raw?.startsWith("-") || following.raw?.startsWith("+");
+      return exp.raw?.startsWith("-") || exp.raw?.startsWith("+");
     }
     case "PipelineExpression":
     case "UnwrappedExpression": {
-      return needsPrecedingSemicolon(following.children[1]);
+      return needsPrecedingSemicolon(exp.children[1]);
     }
     default: {
-      if (following.children) {
-        return needsPrecedingSemicolon(following.children[0]);
+      if (exp.children) {
+        return needsPrecedingSemicolon(exp.children);
       }
       ;
       return;
@@ -1366,8 +1413,7 @@ function processPatternMatching(statements, ReservedWord, getRef) {
     const { clauses } = caseBlock;
     for (const c of clauses) {
       if (c.type === "WhenClause" && c.break) {
-        const last = c.block?.expressions?.at(-1)?.[1];
-        if (isExit(last)) {
+        if (isExit(c.block)) {
           c.children.splice(c.children.indexOf(c.break), 1);
           c.break = void 0;
         }
@@ -1926,10 +1972,16 @@ function assignResults(node, collect) {
   if (!Array.isArray(node)) {
     return;
   }
-  let [, exp] = node;
+  let [, exp, semi] = node;
+  if (semi?.type === "SemicolonDelimiter") {
+    return;
+  }
   if (!exp) {
     return;
   }
+  if (isExit(exp)) {
+    return;
+  }
   const outer = exp;
   let { type } = exp;
   if (type === "LabelledStatement") {
@@ -2021,6 +2073,9 @@ function insertReturn(node, outerNode = node) {
   if (!exp) {
     return;
   }
+  if (isExit(exp)) {
+    return;
+  }
   const outer = exp;
   let { type } = exp;
   if (type === "LabelledStatement") {
@@ -2713,6 +2768,7 @@ function processPipelineExpressions(statements) {
                 switch (access.type) {
                   case "PropertyAccess":
                   case "SliceExpression":
+                  case "Index":
                     break;
                   default:
                     children.unshift({
@@ -2749,6 +2805,7 @@ function processPipelineExpressions(statements) {
             exp: children
           });
           arg = clone(arg);
+          removeHoistDecs(arg);
           if (arg.children[0].type === "Ref") {
             arg.children[0] = usingRef;
           }
@@ -4388,7 +4445,7 @@ function processPartialPlaceholders(statements) {
     const exp = _exp;
     let { ancestor } = findAncestor(exp, ($4) => $4?.type === "Call");
     ancestor = ancestor?.parent;
-    while (ancestor?.parent?.type === "UnaryExpression") {
+    while (ancestor?.parent?.type === "UnaryExpression" || ancestor?.parent?.type === "NewExpression") {
       ancestor = ancestor.parent;
     }
     if (ancestor) {
@@ -6394,7 +6451,15 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "ArgumentsWithTrailingMemberExpressions", ArgumentsWithTrailingMemberExpressions$0);
     }
     var TrailingMemberExpressions$0 = $TS($S($Q(MemberExpressionRest), $Q($S(IndentedAtLeast, $Y($S($E($EXPECT($L6, 'TrailingMemberExpressions "?"')), $EXPECT($L7, 'TrailingMemberExpressions "."'), $N($EXPECT($R2, "TrailingMemberExpressions /[0-9]/")))), MemberExpressionRest))), function($skip, $loc, $0, $1, $2) {
-      return $1.concat($2);
+      return $1.concat($2.map(([ws, , memberExpressionRest]) => {
+        if (Array.isArray(memberExpressionRest)) {
+          return [ws, ...memberExpressionRest];
+        }
+        return {
+          ...memberExpressionRest,
+          children: [ws, ...memberExpressionRest.children]
+        };
+      }));
     });
     function TrailingMemberExpressions(ctx, state) {
       return $EVENT(ctx, state, "TrailingMemberExpressions", TrailingMemberExpressions$0);
@@ -7113,19 +7178,25 @@ var require_parser = __commonJS({
       return $EVENT(ctx, state, "ImplementsTarget", ImplementsTarget$0);
     }
     var ClassBody$0 = $TS($S(__, OpenBrace, $E(NestedClassElements), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var elements = $3;
+      var expressions = $3;
+      if (!expressions)
+        expressions = $0[2] = [];
       return {
-        type: "ClassBody",
+        type: "BlockStatement",
+        subtype: "ClassBody",
         children: $0,
-        elements
+        expressions
       };
     });
     var ClassBody$1 = $TS($S(InsertOpenBrace, $E(NestedClassElements), InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var elements = $2;
+      var expressions = $2;
+      if (!expressions)
+        expressions = $0[1] = [];
       return {
-        type: "ClassBody",
+        type: "BlockStatement",
+        subtype: "ClassBody",
         children: $0,
-        elements
+        expressions
       };
     });
     var ClassBody$$ = [ClassBody$0, ClassBody$1];
@@ -10736,6 +10807,7 @@ var require_parser = __commonJS({
       var clause = $1;
       var block = $2;
       return {
+        ...clause,
         type: "IterationStatement",
         children: [...clause.children, block],
         block
@@ -10744,15 +10816,38 @@ var require_parser = __commonJS({
     function LoopStatement(ctx, state) {
       return $EVENT(ctx, state, "LoopStatement", LoopStatement$0);
     }
-    var LoopClause$0 = $T($S(Loop), function(value) {
-      return { "type": "IterationStatement", "children": [value[0]] };
+    var LoopClause$0 = $TV(Loop, function($skip, $loc, $0, $1) {
+      var kind = $0;
+      const expression = {
+        type: "Literal",
+        children: ["true"],
+        raw: "true"
+      };
+      const condition = {
+        type: "ParenthesizedExpression",
+        children: ["(", expression, ")"],
+        expression
+      };
+      return {
+        type: "IterationStatement",
+        subtype: kind.token,
+        children: [kind, condition],
+        condition
+      };
     });
     function LoopClause(ctx, state) {
       return $EVENT(ctx, state, "LoopClause", LoopClause$0);
     }
-    var DoWhileStatement$0 = $T($S(Do, NoPostfixBracedBlock, __, WhileClause), function(value) {
-      var block = value[1];
-      return { "type": "IterationStatement", "children": value, "block": block };
+    var DoWhileStatement$0 = $TS($S(Do, NoPostfixBracedBlock, __, WhileClause), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var block = $2;
+      var clause = $4;
+      return {
+        ...clause,
+        type: "IterationStatement",
+        subtype: "do-while",
+        children: $0,
+        block
+      };
     });
     function DoWhileStatement(ctx, state) {
       return $EVENT(ctx, state, "DoWhileStatement", DoWhileStatement$0);
@@ -10791,6 +10886,7 @@ var require_parser = __commonJS({
       }
       return {
         type: "IterationStatement",
+        subtype: kind.token,
         children: [kind, ws, condition],
         condition
       };
@@ -12915,7 +13011,7 @@ var require_parser = __commonJS({
       return $EVENT_C(ctx, state, "LetOrConstOrVar", LetOrConstOrVar$$);
     }
     var Loop$0 = $TS($S($EXPECT($L167, 'Loop "loop"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-      return { $loc, token: "while(true)" };
+      return { $loc, token: "while" };
     });
     function Loop(ctx, state) {
       return $EVENT(ctx, state, "Loop", Loop$0);
@@ -14421,7 +14517,7 @@ var require_parser = __commonJS({
         "]"
       ];
     });
-    var TypeIndexedAccess$2 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+    var TypeIndexedAccess$2 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E($C(IdentifierName, LengthShorthand))), function($skip, $loc, $0, $1, $2, $3) {
       var p = $2;
       var id = $3;
       const open = { ...p, token: '["' };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.92",
+  "version": "0.6.93",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -118,7 +118,8 @@
       "source"
     ],
     "exclude": [
-      "source/parser/types.civet"
+      "source/parser/types.civet",
+      "source/bun-civet.civet"
     ]
   },
   "mocha": {