@danielx/civet 0.6.58 → 0.6.59

package/dist/browser.js

@@ -1595,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 {
@@ -1725,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);
       }
@@ -2415,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;
           }
@@ -2965,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")) {
@@ -3593,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) {
@@ -6015,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;
@@ -6121,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;
@@ -6132,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) {
@@ -6149,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$$);
       }

package/dist/main.js

@@ -1587,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 {
@@ -1717,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);
     }
@@ -2407,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;
         }
@@ -2957,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")) {
@@ -3585,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) {
@@ -6007,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;
@@ -6113,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;
@@ -6124,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) {
@@ -6141,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$$);
     }

package/dist/main.mjs

@@ -1585,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 {
@@ -1715,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);
     }
@@ -2405,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;
         }
@@ -2955,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")) {
@@ -3583,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) {
@@ -6005,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;
@@ -6111,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;
@@ -6122,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) {
@@ -6139,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$$);
     }

package/package.json

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