@danielx/civet 0.6.57 → 0.6.59

package/dist/browser.js

@@ -1131,12 +1131,12 @@ ${input.slice(result.pos)}
         }
         return node;
       }
-      function wrapIterationReturningResults(statement, outerRef) {
+      function wrapIterationReturningResults(statement, outer, outerRef) {
         if (statement.type === "DoStatement") {
           if (outerRef) {
             insertPush(statement.block, outerRef);
           } else {
-            insertReturn(statement.block);
+            insertReturn(statement.block, outer);
           }
           return;
         }
@@ -1146,7 +1146,7 @@ ${input.slice(result.pos)}
           children: ["const ", resultsRef, "=[];"]
         };
         insertPush(statement.block, resultsRef);
-        statement.children.unshift(declaration);
+        outer.children.unshift(declaration);
         if (outerRef) {
           statement.children.push(";", outerRef, ".push(", resultsRef, ");");
         } else {
@@ -1180,10 +1180,17 @@ ${input.slice(result.pos)}
         }
         if (!Array.isArray(node))
           return;
-        const [, exp] = node;
-        if (!exp)
+        let [, exp] = node;
+        if (!exp) {
           return;
+        }
         const indent = getIndent(node);
+        const outer = exp;
+        let { type } = exp;
+        if (type === "LabelledStatement") {
+          exp = exp.statement;
+          ({ type } = exp);
+        }
         switch (exp.type) {
           case "BreakStatement":
           case "ContinueStatement":
@@ -1204,7 +1211,7 @@ ${input.slice(result.pos)}
           case "ForStatement":
           case "IterationStatement":
           case "DoStatement":
-            wrapIterationReturningResults(exp, ref);
+            wrapIterationReturningResults(exp, outer, ref);
             return;
           case "BlockStatement":
             insertPush(exp.expressions[exp.expressions.length - 1], ref);
@@ -1573,7 +1580,7 @@ ${input.slice(result.pos)}
             return pattern;
         }
       }
-      function insertReturn(node) {
+      function insertReturn(node, outerNode = node) {
         if (!node)
           return;
         switch (node.type) {
@@ -1588,7 +1595,9 @@ ${input.slice(result.pos)}
             }
             return;
           case "WhenClause":
-            node.children.splice(node.children.indexOf(node.break), 1);
+            if (node.break) {
+              node.children.splice(node.children.indexOf(node.break), 1);
+            }
             if (node.block.expressions.length) {
               insertReturn(node.block);
             } else {
@@ -1601,12 +1610,20 @@ ${input.slice(result.pos)}
         }
         if (!Array.isArray(node))
           return;
-        const [, exp, semi] = node;
-        if (semi?.type === "SemicolonDelimiter")
+        let [, exp, semi] = node;
+        if (semi?.type === "SemicolonDelimiter") {
           return;
-        if (!exp)
+        }
+        if (!exp) {
           return;
-        switch (exp.type) {
+        }
+        const outer = exp;
+        let { type } = exp;
+        if (type === "LabelledStatement") {
+          exp = exp.statement;
+          ({ type } = exp);
+        }
+        switch (type) {
           case "BreakStatement":
           case "ContinueStatement":
           case "DebuggerStatement":
@@ -1637,7 +1654,7 @@ ${input.slice(result.pos)}
           case "ForStatement":
           case "IterationStatement":
           case "DoStatement":
-            wrapIterationReturningResults(exp);
+            wrapIterationReturningResults(exp, outer);
             return;
           case "BlockStatement":
             insertReturn(exp.expressions[exp.expressions.length - 1]);
@@ -1690,6 +1707,9 @@ ${input.slice(result.pos)}
       function isPromiseVoidType(t) {
         return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
       }
+      function isGeneratorVoidType(t) {
+        return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+      }
       function isWhitespaceOrEmpty(node) {
         if (!node)
           return true;
@@ -1707,6 +1727,14 @@ ${input.slice(result.pos)}
           return node.every(isWhitespaceOrEmpty);
         return;
       }
+      function isExit(node) {
+        return [
+          "ReturnStatement",
+          "ThrowStatement",
+          "BreakStatement",
+          "ContinueStatement"
+        ].includes(node?.type);
+      }
       function gatherRecursiveWithinFunction(node, predicate) {
         return gatherRecursive(node, predicate, isFunction);
       }
@@ -2397,9 +2425,7 @@ ${input.slice(result.pos)}
           case "IterationStatement": {
             const { children, block } = s;
             const newBlock = blockWithPrefix(condition.expression.blockPrefix, block);
-            s.children = children.map(function(c) {
-              return c.type === "BlockStatement" ? newBlock : c;
-            });
+            s.children = children.map((c) => c?.type === "BlockStatement" ? newBlock : c);
             updateParentPointers(newBlock, s);
             break;
           }
@@ -2477,10 +2503,10 @@ ${input.slice(result.pos)}
         if (!processReturnValue(f) && implicitReturns) {
           const { signature, block } = f;
           const { modifier, name, returnType } = signature;
-          const { async, set } = modifier;
+          const { async, generator, set } = modifier;
           const isMethod = f.type === "MethodDefinition";
           const isConstructor = isMethod && name === "constructor";
-          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t) || !async && generator && isGeneratorVoidType(returnType?.t);
           const isBlock = block?.type === "BlockStatement";
           if (!isVoid && !set && !isConstructor && isBlock) {
             insertReturn(block);
@@ -2947,6 +2973,15 @@ ${input.slice(result.pos)}
         gatherRecursiveAll(statements, (n) => n.type === "SwitchStatement").forEach((s) => {
           const { caseBlock } = s;
           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)) {
+                c.children.splice(c.children.indexOf(c.break), 1);
+                c.break = void 0;
+              }
+            }
+          }
           let errors = false;
           let isPattern = false;
           if (clauses.some((c) => c.type === "PatternClause")) {
@@ -3575,20 +3610,29 @@ ${input.slice(result.pos)}
         };
       }
       function replaceNodes(root, predicate, replacer) {
-        if (root == null)
+        if (!(root != null)) {
           return root;
+        }
         const array = Array.isArray(root) ? root : root.children;
-        if (!array)
-          return root;
-        array.forEach((node, i) => {
-          if (node == null)
+        if (!array) {
+          if (predicate(root)) {
+            return replacer(root, root);
+          } else {
+            return root;
+          }
+        }
+        for (let i4 = 0, len4 = array.length; i4 < len4; i4++) {
+          const i = i4;
+          const node = array[i4];
+          if (!(node != null)) {
             return;
+          }
           if (predicate(node)) {
-            return array[i] = replacer(node, root);
+            array[i] = replacer(node, root);
           } else {
-            return replaceNodes(node, predicate, replacer);
+            replaceNodes(node, predicate, replacer);
           }
-        });
+        }
         return root;
       }
       function skipIfOnlyWS(target) {
@@ -5997,33 +6041,8 @@ ${input.slice(result.pos)}
           expression
         };
       });
-      var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
-        var dot = $1;
-        var literal = $2;
-        if (Array.isArray(dot))
-          dot = dot[0];
-        return {
-          type: "Index",
-          children: [
-            { token: "[", $loc: dot.$loc },
-            literal,
-            "]"
-          ]
-        };
-      });
-      var MemberBracketContent$2 = $TS($S(Dot, $EXPECT($L19, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
-        var dot = $1;
-        var neg = $2;
-        var num = $3;
-        return [
-          { type: "PropertyAccess", children: [dot, "at"] },
-          // not including `name` so that `{x.-1}` doesn't use it
-          { type: "Call", children: ["(", neg, num, ")"] }
-        ];
-      });
-      var MemberBracketContent$$ = [MemberBracketContent$0, MemberBracketContent$1, MemberBracketContent$2];
       function MemberBracketContent(ctx, state) {
-        return $EVENT_C(ctx, state, "MemberBracketContent", MemberBracketContent$$);
+        return $EVENT(ctx, state, "MemberBracketContent", MemberBracketContent$0);
       }
       var SliceParameters$0 = $TS($S(ExtendedExpression, __, $C(DotDotDot, DotDot), $E(ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4) {
         var start = $1;
@@ -6103,7 +6122,34 @@ ${input.slice(result.pos)}
       function PropertyAccessModifier(ctx, state) {
         return $EVENT_C(ctx, state, "PropertyAccessModifier", PropertyAccessModifier$$);
       }
-      var PropertyAccess$0 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyAccess$0 = $TS($S(AccessStart, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
+        var dot = $1;
+        var literal = $2;
+        dot = replaceNodes(
+          deepCopy(dot),
+          (node) => node.token === ".",
+          (node) => ({ token: "[", $loc: node.$loc })
+        );
+        return {
+          type: "Index",
+          children: [
+            dot,
+            literal,
+            "]"
+          ]
+        };
+      });
+      var PropertyAccess$1 = $TS($S(AccessStart, $EXPECT($L19, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+        var dot = $1;
+        var neg = $2;
+        var num = $3;
+        return [
+          { type: "PropertyAccess", children: [dot, "at"] },
+          // not including `name` so that `{x.-1}` doesn't use it
+          { type: "Call", children: ["(", neg, num, ")"] }
+        ];
+      });
+      var PropertyAccess$2 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
         var access = $1;
         var comments = $2;
         var id = $3;
@@ -6114,7 +6160,7 @@ ${input.slice(result.pos)}
           children
         };
       });
-      var PropertyAccess$1 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+      var PropertyAccess$3 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
         var p = $2;
         var id = $3;
         if (id) {
@@ -6131,7 +6177,7 @@ ${input.slice(result.pos)}
           };
         }
       });
-      var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1];
+      var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1, PropertyAccess$2, PropertyAccess$3];
       function PropertyAccess(ctx, state) {
         return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
       }
@@ -6845,7 +6891,12 @@ ${input.slice(result.pos)}
         return {
           ...fn,
           id,
-          children: [...fn.children.slice(0, 2), insertTrimmingSpace(ws, " "), id, ...fn.children.slice(2)]
+          children: [
+            ...fn.children.slice(0, 3),
+            insertTrimmingSpace(ws, " "),
+            id,
+            ...fn.children.slice(3)
+          ]
         };
       });
       var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3];
@@ -8100,7 +8151,7 @@ ${input.slice(result.pos)}
         var block = $3;
         let children = $0;
         let generatorPos = 0;
-        const { modifier } = signature;
+        let { modifier } = signature;
         if (hasAwait(block)) {
           generatorPos++;
           children = children.slice();
@@ -8112,6 +8163,8 @@ ${input.slice(result.pos)}
           } else if (modifier?.async) {
           } else {
             children.unshift("async ");
+            modifier = { ...modifier, async: true };
+            signature = { ...signature, modifier };
           }
         }
         if (hasYield(block)) {
@@ -8125,6 +8178,8 @@ ${input.slice(result.pos)}
           } else if (modifier?.generator) {
           } else {
             children.splice(generatorPos, 0, "*");
+            modifier = { ...modifier, generator: true };
+            signature = { ...signature, modifier };
           }
         }
         return {
@@ -8226,7 +8281,7 @@ ${input.slice(result.pos)}
           async: true,
           get: false,
           set: false,
-          generator: !!$1,
+          generator: !!$2,
           children: $0
         };
       });
@@ -8853,7 +8908,16 @@ ${input.slice(result.pos)}
       function BlockStatement(ctx, state) {
         return $EVENT(ctx, state, "BlockStatement", BlockStatement$0);
       }
-      var LabelledStatement$0 = $S(Label, LabelledItem);
+      var LabelledStatement$0 = $TS($S(Label, LabelledItem), function($skip, $loc, $0, $1, $2) {
+        var label = $1;
+        var statement = $2;
+        return {
+          type: "LabelledStatement",
+          label,
+          statement,
+          children: $0
+        };
+      });
       function LabelledStatement(ctx, state) {
         return $EVENT(ctx, state, "LabelledStatement", LabelledStatement$0);
       }

package/dist/main.js

@@ -1123,12 +1123,12 @@ var require_lib = __commonJS({
       }
       return node;
     }
-    function wrapIterationReturningResults(statement, outerRef) {
+    function wrapIterationReturningResults(statement, outer, outerRef) {
       if (statement.type === "DoStatement") {
         if (outerRef) {
           insertPush(statement.block, outerRef);
         } else {
-          insertReturn(statement.block);
+          insertReturn(statement.block, outer);
         }
         return;
       }
@@ -1138,7 +1138,7 @@ var require_lib = __commonJS({
         children: ["const ", resultsRef, "=[];"]
       };
       insertPush(statement.block, resultsRef);
-      statement.children.unshift(declaration);
+      outer.children.unshift(declaration);
       if (outerRef) {
         statement.children.push(";", outerRef, ".push(", resultsRef, ");");
       } else {
@@ -1172,10 +1172,17 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp] = node;
-      if (!exp)
+      let [, exp] = node;
+      if (!exp) {
         return;
+      }
       const indent = getIndent(node);
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
       switch (exp.type) {
         case "BreakStatement":
         case "ContinueStatement":
@@ -1196,7 +1203,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp, ref);
+          wrapIterationReturningResults(exp, outer, ref);
           return;
         case "BlockStatement":
           insertPush(exp.expressions[exp.expressions.length - 1], ref);
@@ -1565,7 +1572,7 @@ var require_lib = __commonJS({
           return pattern;
       }
     }
-    function insertReturn(node) {
+    function insertReturn(node, outerNode = node) {
       if (!node)
         return;
       switch (node.type) {
@@ -1580,7 +1587,9 @@ var require_lib = __commonJS({
           }
           return;
         case "WhenClause":
-          node.children.splice(node.children.indexOf(node.break), 1);
+          if (node.break) {
+            node.children.splice(node.children.indexOf(node.break), 1);
+          }
           if (node.block.expressions.length) {
             insertReturn(node.block);
           } else {
@@ -1593,12 +1602,20 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp, semi] = node;
-      if (semi?.type === "SemicolonDelimiter")
+      let [, exp, semi] = node;
+      if (semi?.type === "SemicolonDelimiter") {
         return;
-      if (!exp)
+      }
+      if (!exp) {
         return;
-      switch (exp.type) {
+      }
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
+      switch (type) {
         case "BreakStatement":
         case "ContinueStatement":
         case "DebuggerStatement":
@@ -1629,7 +1646,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp);
+          wrapIterationReturningResults(exp, outer);
           return;
         case "BlockStatement":
           insertReturn(exp.expressions[exp.expressions.length - 1]);
@@ -1682,6 +1699,9 @@ var require_lib = __commonJS({
     function isPromiseVoidType(t) {
       return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
     }
+    function isGeneratorVoidType(t) {
+      return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+    }
     function isWhitespaceOrEmpty(node) {
       if (!node)
         return true;
@@ -1699,6 +1719,14 @@ var require_lib = __commonJS({
         return node.every(isWhitespaceOrEmpty);
       return;
     }
+    function isExit(node) {
+      return [
+        "ReturnStatement",
+        "ThrowStatement",
+        "BreakStatement",
+        "ContinueStatement"
+      ].includes(node?.type);
+    }
     function gatherRecursiveWithinFunction(node, predicate) {
       return gatherRecursive(node, predicate, isFunction);
     }
@@ -2389,9 +2417,7 @@ var require_lib = __commonJS({
         case "IterationStatement": {
           const { children, block } = s;
           const newBlock = blockWithPrefix(condition.expression.blockPrefix, block);
-          s.children = children.map(function(c) {
-            return c.type === "BlockStatement" ? newBlock : c;
-          });
+          s.children = children.map((c) => c?.type === "BlockStatement" ? newBlock : c);
           updateParentPointers(newBlock, s);
           break;
         }
@@ -2469,10 +2495,10 @@ var require_lib = __commonJS({
       if (!processReturnValue(f) && implicitReturns) {
         const { signature, block } = f;
         const { modifier, name, returnType } = signature;
-        const { async, set } = modifier;
+        const { async, generator, set } = modifier;
         const isMethod = f.type === "MethodDefinition";
         const isConstructor = isMethod && name === "constructor";
-        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t) || !async && generator && isGeneratorVoidType(returnType?.t);
         const isBlock = block?.type === "BlockStatement";
         if (!isVoid && !set && !isConstructor && isBlock) {
           insertReturn(block);
@@ -2939,6 +2965,15 @@ var require_lib = __commonJS({
       gatherRecursiveAll(statements, (n) => n.type === "SwitchStatement").forEach((s) => {
         const { caseBlock } = s;
         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)) {
+              c.children.splice(c.children.indexOf(c.break), 1);
+              c.break = void 0;
+            }
+          }
+        }
         let errors = false;
         let isPattern = false;
         if (clauses.some((c) => c.type === "PatternClause")) {
@@ -3567,20 +3602,29 @@ var require_lib = __commonJS({
       };
     }
     function replaceNodes(root, predicate, replacer) {
-      if (root == null)
+      if (!(root != null)) {
         return root;
+      }
       const array = Array.isArray(root) ? root : root.children;
-      if (!array)
-        return root;
-      array.forEach((node, i) => {
-        if (node == null)
+      if (!array) {
+        if (predicate(root)) {
+          return replacer(root, root);
+        } else {
+          return root;
+        }
+      }
+      for (let i4 = 0, len4 = array.length; i4 < len4; i4++) {
+        const i = i4;
+        const node = array[i4];
+        if (!(node != null)) {
           return;
+        }
         if (predicate(node)) {
-          return array[i] = replacer(node, root);
+          array[i] = replacer(node, root);
         } else {
-          return replaceNodes(node, predicate, replacer);
+          replaceNodes(node, predicate, replacer);
         }
-      });
+      }
       return root;
     }
     function skipIfOnlyWS(target) {
@@ -5989,33 +6033,8 @@ var require_parser = __commonJS({
         expression
       };
     });
-    var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
-      var dot = $1;
-      var literal = $2;
-      if (Array.isArray(dot))
-        dot = dot[0];
-      return {
-        type: "Index",
-        children: [
-          { token: "[", $loc: dot.$loc },
-          literal,
-          "]"
-        ]
-      };
-    });
-    var MemberBracketContent$2 = $TS($S(Dot, $EXPECT($L19, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
-      var dot = $1;
-      var neg = $2;
-      var num = $3;
-      return [
-        { type: "PropertyAccess", children: [dot, "at"] },
-        // not including `name` so that `{x.-1}` doesn't use it
-        { type: "Call", children: ["(", neg, num, ")"] }
-      ];
-    });
-    var MemberBracketContent$$ = [MemberBracketContent$0, MemberBracketContent$1, MemberBracketContent$2];
     function MemberBracketContent(ctx, state) {
-      return $EVENT_C(ctx, state, "MemberBracketContent", MemberBracketContent$$);
+      return $EVENT(ctx, state, "MemberBracketContent", MemberBracketContent$0);
     }
     var SliceParameters$0 = $TS($S(ExtendedExpression, __, $C(DotDotDot, DotDot), $E(ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4) {
       var start = $1;
@@ -6095,7 +6114,34 @@ var require_parser = __commonJS({
     function PropertyAccessModifier(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyAccessModifier", PropertyAccessModifier$$);
     }
-    var PropertyAccess$0 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyAccess$0 = $TS($S(AccessStart, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
+      var dot = $1;
+      var literal = $2;
+      dot = replaceNodes(
+        deepCopy(dot),
+        (node) => node.token === ".",
+        (node) => ({ token: "[", $loc: node.$loc })
+      );
+      return {
+        type: "Index",
+        children: [
+          dot,
+          literal,
+          "]"
+        ]
+      };
+    });
+    var PropertyAccess$1 = $TS($S(AccessStart, $EXPECT($L19, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+      var dot = $1;
+      var neg = $2;
+      var num = $3;
+      return [
+        { type: "PropertyAccess", children: [dot, "at"] },
+        // not including `name` so that `{x.-1}` doesn't use it
+        { type: "Call", children: ["(", neg, num, ")"] }
+      ];
+    });
+    var PropertyAccess$2 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
       var access = $1;
       var comments = $2;
       var id = $3;
@@ -6106,7 +6152,7 @@ var require_parser = __commonJS({
         children
       };
     });
-    var PropertyAccess$1 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyAccess$3 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
       var p = $2;
       var id = $3;
       if (id) {
@@ -6123,7 +6169,7 @@ var require_parser = __commonJS({
         };
       }
     });
-    var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1];
+    var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1, PropertyAccess$2, PropertyAccess$3];
     function PropertyAccess(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
     }
@@ -6837,7 +6883,12 @@ var require_parser = __commonJS({
       return {
         ...fn,
         id,
-        children: [...fn.children.slice(0, 2), insertTrimmingSpace(ws, " "), id, ...fn.children.slice(2)]
+        children: [
+          ...fn.children.slice(0, 3),
+          insertTrimmingSpace(ws, " "),
+          id,
+          ...fn.children.slice(3)
+        ]
       };
     });
     var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3];
@@ -8092,7 +8143,7 @@ var require_parser = __commonJS({
       var block = $3;
       let children = $0;
       let generatorPos = 0;
-      const { modifier } = signature;
+      let { modifier } = signature;
       if (hasAwait(block)) {
         generatorPos++;
         children = children.slice();
@@ -8104,6 +8155,8 @@ var require_parser = __commonJS({
         } else if (modifier?.async) {
         } else {
           children.unshift("async ");
+          modifier = { ...modifier, async: true };
+          signature = { ...signature, modifier };
         }
       }
       if (hasYield(block)) {
@@ -8117,6 +8170,8 @@ var require_parser = __commonJS({
         } else if (modifier?.generator) {
         } else {
           children.splice(generatorPos, 0, "*");
+          modifier = { ...modifier, generator: true };
+          signature = { ...signature, modifier };
         }
       }
       return {
@@ -8218,7 +8273,7 @@ var require_parser = __commonJS({
         async: true,
         get: false,
         set: false,
-        generator: !!$1,
+        generator: !!$2,
         children: $0
       };
     });
@@ -8845,7 +8900,16 @@ var require_parser = __commonJS({
     function BlockStatement(ctx, state) {
       return $EVENT(ctx, state, "BlockStatement", BlockStatement$0);
     }
-    var LabelledStatement$0 = $S(Label, LabelledItem);
+    var LabelledStatement$0 = $TS($S(Label, LabelledItem), function($skip, $loc, $0, $1, $2) {
+      var label = $1;
+      var statement = $2;
+      return {
+        type: "LabelledStatement",
+        label,
+        statement,
+        children: $0
+      };
+    });
     function LabelledStatement(ctx, state) {
       return $EVENT(ctx, state, "LabelledStatement", LabelledStatement$0);
     }

package/dist/main.mjs

@@ -1121,12 +1121,12 @@ var require_lib = __commonJS({
       }
       return node;
     }
-    function wrapIterationReturningResults(statement, outerRef) {
+    function wrapIterationReturningResults(statement, outer, outerRef) {
       if (statement.type === "DoStatement") {
         if (outerRef) {
           insertPush(statement.block, outerRef);
         } else {
-          insertReturn(statement.block);
+          insertReturn(statement.block, outer);
         }
         return;
       }
@@ -1136,7 +1136,7 @@ var require_lib = __commonJS({
         children: ["const ", resultsRef, "=[];"]
       };
       insertPush(statement.block, resultsRef);
-      statement.children.unshift(declaration);
+      outer.children.unshift(declaration);
       if (outerRef) {
         statement.children.push(";", outerRef, ".push(", resultsRef, ");");
       } else {
@@ -1170,10 +1170,17 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp] = node;
-      if (!exp)
+      let [, exp] = node;
+      if (!exp) {
         return;
+      }
       const indent = getIndent(node);
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
       switch (exp.type) {
         case "BreakStatement":
         case "ContinueStatement":
@@ -1194,7 +1201,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp, ref);
+          wrapIterationReturningResults(exp, outer, ref);
           return;
         case "BlockStatement":
           insertPush(exp.expressions[exp.expressions.length - 1], ref);
@@ -1563,7 +1570,7 @@ var require_lib = __commonJS({
           return pattern;
       }
     }
-    function insertReturn(node) {
+    function insertReturn(node, outerNode = node) {
       if (!node)
         return;
       switch (node.type) {
@@ -1578,7 +1585,9 @@ var require_lib = __commonJS({
           }
           return;
         case "WhenClause":
-          node.children.splice(node.children.indexOf(node.break), 1);
+          if (node.break) {
+            node.children.splice(node.children.indexOf(node.break), 1);
+          }
           if (node.block.expressions.length) {
             insertReturn(node.block);
           } else {
@@ -1591,12 +1600,20 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp, semi] = node;
-      if (semi?.type === "SemicolonDelimiter")
+      let [, exp, semi] = node;
+      if (semi?.type === "SemicolonDelimiter") {
         return;
-      if (!exp)
+      }
+      if (!exp) {
         return;
-      switch (exp.type) {
+      }
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
+      switch (type) {
         case "BreakStatement":
         case "ContinueStatement":
         case "DebuggerStatement":
@@ -1627,7 +1644,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp);
+          wrapIterationReturningResults(exp, outer);
           return;
         case "BlockStatement":
           insertReturn(exp.expressions[exp.expressions.length - 1]);
@@ -1680,6 +1697,9 @@ var require_lib = __commonJS({
     function isPromiseVoidType(t) {
       return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
     }
+    function isGeneratorVoidType(t) {
+      return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+    }
     function isWhitespaceOrEmpty(node) {
       if (!node)
         return true;
@@ -1697,6 +1717,14 @@ var require_lib = __commonJS({
         return node.every(isWhitespaceOrEmpty);
       return;
     }
+    function isExit(node) {
+      return [
+        "ReturnStatement",
+        "ThrowStatement",
+        "BreakStatement",
+        "ContinueStatement"
+      ].includes(node?.type);
+    }
     function gatherRecursiveWithinFunction(node, predicate) {
       return gatherRecursive(node, predicate, isFunction);
     }
@@ -2387,9 +2415,7 @@ var require_lib = __commonJS({
         case "IterationStatement": {
           const { children, block } = s;
           const newBlock = blockWithPrefix(condition.expression.blockPrefix, block);
-          s.children = children.map(function(c) {
-            return c.type === "BlockStatement" ? newBlock : c;
-          });
+          s.children = children.map((c) => c?.type === "BlockStatement" ? newBlock : c);
           updateParentPointers(newBlock, s);
           break;
         }
@@ -2467,10 +2493,10 @@ var require_lib = __commonJS({
       if (!processReturnValue(f) && implicitReturns) {
         const { signature, block } = f;
         const { modifier, name, returnType } = signature;
-        const { async, set } = modifier;
+        const { async, generator, set } = modifier;
         const isMethod = f.type === "MethodDefinition";
         const isConstructor = isMethod && name === "constructor";
-        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t) || !async && generator && isGeneratorVoidType(returnType?.t);
         const isBlock = block?.type === "BlockStatement";
         if (!isVoid && !set && !isConstructor && isBlock) {
           insertReturn(block);
@@ -2937,6 +2963,15 @@ var require_lib = __commonJS({
       gatherRecursiveAll(statements, (n) => n.type === "SwitchStatement").forEach((s) => {
         const { caseBlock } = s;
         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)) {
+              c.children.splice(c.children.indexOf(c.break), 1);
+              c.break = void 0;
+            }
+          }
+        }
         let errors = false;
         let isPattern = false;
         if (clauses.some((c) => c.type === "PatternClause")) {
@@ -3565,20 +3600,29 @@ var require_lib = __commonJS({
       };
     }
     function replaceNodes(root, predicate, replacer) {
-      if (root == null)
+      if (!(root != null)) {
         return root;
+      }
       const array = Array.isArray(root) ? root : root.children;
-      if (!array)
-        return root;
-      array.forEach((node, i) => {
-        if (node == null)
+      if (!array) {
+        if (predicate(root)) {
+          return replacer(root, root);
+        } else {
+          return root;
+        }
+      }
+      for (let i4 = 0, len4 = array.length; i4 < len4; i4++) {
+        const i = i4;
+        const node = array[i4];
+        if (!(node != null)) {
           return;
+        }
         if (predicate(node)) {
-          return array[i] = replacer(node, root);
+          array[i] = replacer(node, root);
         } else {
-          return replaceNodes(node, predicate, replacer);
+          replaceNodes(node, predicate, replacer);
         }
-      });
+      }
       return root;
     }
     function skipIfOnlyWS(target) {
@@ -5987,33 +6031,8 @@ var require_parser = __commonJS({
         expression
       };
     });
-    var MemberBracketContent$1 = $TS($S(Dot, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
-      var dot = $1;
-      var literal = $2;
-      if (Array.isArray(dot))
-        dot = dot[0];
-      return {
-        type: "Index",
-        children: [
-          { token: "[", $loc: dot.$loc },
-          literal,
-          "]"
-        ]
-      };
-    });
-    var MemberBracketContent$2 = $TS($S(Dot, $EXPECT($L19, 'MemberBracketContent "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
-      var dot = $1;
-      var neg = $2;
-      var num = $3;
-      return [
-        { type: "PropertyAccess", children: [dot, "at"] },
-        // not including `name` so that `{x.-1}` doesn't use it
-        { type: "Call", children: ["(", neg, num, ")"] }
-      ];
-    });
-    var MemberBracketContent$$ = [MemberBracketContent$0, MemberBracketContent$1, MemberBracketContent$2];
     function MemberBracketContent(ctx, state) {
-      return $EVENT_C(ctx, state, "MemberBracketContent", MemberBracketContent$$);
+      return $EVENT(ctx, state, "MemberBracketContent", MemberBracketContent$0);
     }
     var SliceParameters$0 = $TS($S(ExtendedExpression, __, $C(DotDotDot, DotDot), $E(ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4) {
       var start = $1;
@@ -6093,7 +6112,34 @@ var require_parser = __commonJS({
     function PropertyAccessModifier(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyAccessModifier", PropertyAccessModifier$$);
     }
-    var PropertyAccess$0 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyAccess$0 = $TS($S(AccessStart, $C(TemplateLiteral, StringLiteral, IntegerLiteral)), function($skip, $loc, $0, $1, $2) {
+      var dot = $1;
+      var literal = $2;
+      dot = replaceNodes(
+        deepCopy(dot),
+        (node) => node.token === ".",
+        (node) => ({ token: "[", $loc: node.$loc })
+      );
+      return {
+        type: "Index",
+        children: [
+          dot,
+          literal,
+          "]"
+        ]
+      };
+    });
+    var PropertyAccess$1 = $TS($S(AccessStart, $EXPECT($L19, 'PropertyAccess "-"'), IntegerLiteral), function($skip, $loc, $0, $1, $2, $3) {
+      var dot = $1;
+      var neg = $2;
+      var num = $3;
+      return [
+        { type: "PropertyAccess", children: [dot, "at"] },
+        // not including `name` so that `{x.-1}` doesn't use it
+        { type: "Call", children: ["(", neg, num, ")"] }
+      ];
+    });
+    var PropertyAccess$2 = $TS($S(AccessStart, $Q(InlineComment), $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3) {
       var access = $1;
       var comments = $2;
       var id = $3;
@@ -6104,7 +6150,7 @@ var require_parser = __commonJS({
         children
       };
     });
-    var PropertyAccess$1 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyAccess$3 = $TS($S(CoffeePrototypeEnabled, DoubleColon, $E(IdentifierName)), function($skip, $loc, $0, $1, $2, $3) {
       var p = $2;
       var id = $3;
       if (id) {
@@ -6121,7 +6167,7 @@ var require_parser = __commonJS({
         };
       }
     });
-    var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1];
+    var PropertyAccess$$ = [PropertyAccess$0, PropertyAccess$1, PropertyAccess$2, PropertyAccess$3];
     function PropertyAccess(ctx, state) {
       return $EVENT_C(ctx, state, "PropertyAccess", PropertyAccess$$);
     }
@@ -6835,7 +6881,12 @@ var require_parser = __commonJS({
       return {
         ...fn,
         id,
-        children: [...fn.children.slice(0, 2), insertTrimmingSpace(ws, " "), id, ...fn.children.slice(2)]
+        children: [
+          ...fn.children.slice(0, 3),
+          insertTrimmingSpace(ws, " "),
+          id,
+          ...fn.children.slice(3)
+        ]
       };
     });
     var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3];
@@ -8090,7 +8141,7 @@ var require_parser = __commonJS({
       var block = $3;
       let children = $0;
       let generatorPos = 0;
-      const { modifier } = signature;
+      let { modifier } = signature;
       if (hasAwait(block)) {
         generatorPos++;
         children = children.slice();
@@ -8102,6 +8153,8 @@ var require_parser = __commonJS({
         } else if (modifier?.async) {
         } else {
           children.unshift("async ");
+          modifier = { ...modifier, async: true };
+          signature = { ...signature, modifier };
         }
       }
       if (hasYield(block)) {
@@ -8115,6 +8168,8 @@ var require_parser = __commonJS({
         } else if (modifier?.generator) {
         } else {
           children.splice(generatorPos, 0, "*");
+          modifier = { ...modifier, generator: true };
+          signature = { ...signature, modifier };
         }
       }
       return {
@@ -8216,7 +8271,7 @@ var require_parser = __commonJS({
         async: true,
         get: false,
         set: false,
-        generator: !!$1,
+        generator: !!$2,
         children: $0
       };
     });
@@ -8843,7 +8898,16 @@ var require_parser = __commonJS({
     function BlockStatement(ctx, state) {
       return $EVENT(ctx, state, "BlockStatement", BlockStatement$0);
     }
-    var LabelledStatement$0 = $S(Label, LabelledItem);
+    var LabelledStatement$0 = $TS($S(Label, LabelledItem), function($skip, $loc, $0, $1, $2) {
+      var label = $1;
+      var statement = $2;
+      return {
+        type: "LabelledStatement",
+        label,
+        statement,
+        children: $0
+      };
+    });
     function LabelledStatement(ctx, state) {
       return $EVENT(ctx, state, "LabelledStatement", LabelledStatement$0);
     }

package/package.json

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