@danielx/civet 0.7.3 → 0.7.4

package/dist/browser.js

@@ -38,9 +38,9 @@ var Civet = (() => {
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // ../Hera/dist/machine.js
+  // node_modules/@danielx/hera/dist/machine.js
   var require_machine = __commonJS({
-    "../Hera/dist/machine.js"(exports, module) {
+    "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
       "use strict";
       var __defProp2 = Object.defineProperty;
       var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1320,8 +1320,8 @@ ${input.slice(result.pos)}
   function replaceBlockExpression(node, child, replacement) {
     let found = false;
     const { expressions } = node;
-    for (let i = 0, l = expressions.length; i < l; i++) {
-      const statement = expressions[i];
+    for (let i1 = 0, len2 = expressions.length; i1 < len2; i1++) {
+      const statement = expressions[i1];
       const [, s] = statement;
       if (s === child) {
         statement[1] = replacement;
@@ -1382,9 +1382,9 @@ ${input.slice(result.pos)}
   }
   function insertSemicolon(statements) {
     const l = statements.length;
-    for (let i1 = 0, len2 = statements.length; i1 < len2; i1++) {
-      const i = i1;
-      const s = statements[i1];
+    for (let i2 = 0, len1 = statements.length; i2 < len1; i2++) {
+      const i = i2;
+      const s = statements[i2];
       if (i < l - 1) {
         if (needsPrecedingSemicolon(statements[i + 1][1])) {
           const delim = s[2];
@@ -1402,8 +1402,8 @@ ${input.slice(result.pos)}
       return false;
     }
     if (Array.isArray(exp)) {
-      for (let i2 = 0, len1 = exp.length; i2 < len1; i2++) {
-        const child = exp[i2];
+      for (let i3 = 0, len2 = exp.length; i3 < len2; i3++) {
+        const child = exp[i3];
         if (!(child != null)) {
           continue;
         }
@@ -1464,9 +1464,12 @@ ${input.slice(result.pos)}
       return;
     }
     node = node;
-    node.parent = parent;
+    if (parent != null) {
+      node.parent = parent;
+    }
     if (node.children) {
-      for (const child of node.children) {
+      for (let ref1 = node.children, i1 = 0, len2 = ref1.length; i1 < len2; i1++) {
+        const child = ref1[i1];
         addParentPointers(child, node);
       }
     }
@@ -1476,10 +1479,9 @@ ${input.slice(result.pos)}
     return deepCopy(node);
   }
   function removeParentPointers(node) {
-    if (node == null)
-      return;
-    if (typeof node !== "object")
+    if (!(node != null && typeof node === "object")) {
       return;
+    }
     if (Array.isArray(node)) {
       for (const child of node) {
         removeParentPointers(child);
@@ -1523,7 +1525,8 @@ ${input.slice(result.pos)}
     if (node?.type !== "BlockStatement")
       return false;
     const { bare, expressions } = node;
-    return bare && (expressions.length === 0 || expressions.length === 1 && expressions[0][1]?.type === "EmptyStatement");
+    return bare && //expressions is like [], [, {type: "EmptyStatement"}]
+    (expressions.length === 0 || expressions.length === 1 && expressions[0][1]?.type === "EmptyStatement");
   }
   function isFunction(node) {
     const { type } = node;
@@ -1571,8 +1574,8 @@ ${input.slice(result.pos)}
     if (!(node != null)) {
       return false;
     }
-    let ref1;
     let ref2;
+    let ref3;
     switch (node.type) {
       case "ReturnStatement":
       case "ThrowStatement":
@@ -1581,10 +1584,10 @@ ${input.slice(result.pos)}
         return true;
       }
       case "IfStatement": {
-        return isExit(node.then) && isExit((ref1 = node.else)?.[ref1.length - 1]);
+        return isExit(node.then) && isExit((ref2 = node.else)?.[ref2.length - 1]);
       }
       case "BlockStatement": {
-        return isExit((ref2 = node.expressions)[ref2.length - 1]?.[1]);
+        return isExit((ref3 = node.expressions)[ref3.length - 1]?.[1]);
       }
       case "IterationStatement": {
         return node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true" && gatherRecursiveWithinFunction(
@@ -1880,8 +1883,8 @@ ${input.slice(result.pos)}
       return;
     }
     if (Array.isArray(node)) {
-      for (let i1 = 0, len2 = node.length; i1 < len2; i1++) {
-        const child = node[i1];
+      for (let i2 = 0, len1 = node.length; i2 < len1; i2++) {
+        const child = node[i2];
         updateParentPointers(child, parent, depth);
       }
       return;
@@ -1891,8 +1894,8 @@ ${input.slice(result.pos)}
       node.parent = parent;
     }
     if (depth && isParent(node)) {
-      for (let ref3 = node.children, i2 = 0, len1 = ref3.length; i2 < len1; i2++) {
-        const child = ref3[i2];
+      for (let ref4 = node.children, i3 = 0, len2 = ref4.length; i3 < len2; i3++) {
+        const child = ref4[i3];
         updateParentPointers(child, node, depth - 1);
       }
     }
@@ -2022,9 +2025,9 @@ ${input.slice(result.pos)}
   }
   function flatJoin(array, separator) {
     const result = [];
-    for (let i3 = 0, len2 = array.length; i3 < len2; i3++) {
-      const i = i3;
-      const items = array[i3];
+    for (let i4 = 0, len3 = array.length; i4 < len3; i4++) {
+      const i = i4;
+      const items = array[i4];
       if (i) {
         result.push(separator);
       }
@@ -2075,8 +2078,9 @@ ${input.slice(result.pos)}
     return { ancestor: void 0, child: node };
   }
   function gatherNodes(node, predicate) {
-    if (node == null)
+    if (node == null || typeof node === "string") {
       return [];
+    }
     if (Array.isArray(node)) {
       return node.flatMap((n) => gatherNodes(n, predicate));
     }
@@ -2084,24 +2088,30 @@ ${input.slice(result.pos)}
       return [node];
     }
     switch (node.type) {
-      case "BlockStatement":
+      case "BlockStatement": {
         return [];
-      case "ForStatement":
+      }
+      case "ForStatement": {
         const isDec = node.declaration?.type === "Declaration";
         return node.children.flatMap((n) => {
-          if (isDec && n === node.declaration)
+          if (isDec && n === node.declaration) {
             return [];
-          return gatherNodes(n, predicate);
+          } else {
+            return gatherNodes(n, predicate);
+          }
         });
-      default:
+      }
+      default: {
         return gatherNodes(node.children, predicate);
+      }
     }
   }
   function gatherRecursive(node, predicate, skipPredicate) {
-    if (node == null)
+    if (node == null || typeof node === "string") {
       return [];
+    }
     if (Array.isArray(node)) {
-      return node.flatMap((n) => gatherRecursive(n, predicate, skipPredicate));
+      return node.flatMap(($) => gatherRecursive($, predicate, skipPredicate));
     }
     if (skipPredicate?.(node))
       return [];
@@ -2111,8 +2121,9 @@ ${input.slice(result.pos)}
     return gatherRecursive(node.children, predicate, skipPredicate);
   }
   function gatherRecursiveAll(node, predicate) {
-    if (node == null)
+    if (node == null || typeof node === "string") {
       return [];
+    }
     if (Array.isArray(node)) {
       return node.flatMap((n) => gatherRecursiveAll(n, predicate));
     }
@@ -3161,9 +3172,12 @@ ${input.slice(result.pos)}
     rootCondition.blockPrefix = getPatternBlockPrefix(pattern, ref, decl, suffix);
   }
   function processDeclarationConditions(node) {
-    gatherRecursiveAll(node, (n) => {
-      return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
-    }).forEach((s) => {
+    gatherRecursiveAll(
+      node,
+      (n) => {
+        return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
+      }
+    ).forEach((s) => {
       return processDeclarationConditionStatement(s);
     });
   }
@@ -7269,8 +7283,8 @@ ${input.slice(result.pos)}
   function SingleLineBinaryOpRHS(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "SingleLineBinaryOpRHS", SingleLineBinaryOpRHS$0);
   }
-  var RHS$0 = UnaryExpression;
-  var RHS$1 = ExpressionizedStatementWithTrailingCallExpressions;
+  var RHS$0 = ExpressionizedStatementWithTrailingCallExpressions;
+  var RHS$1 = UnaryExpression;
   var RHS$$ = [RHS$0, RHS$1];
   function RHS(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "RHS", RHS$$);
@@ -13526,7 +13540,7 @@ ${input.slice(result.pos)}
   function Comma(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "Comma", Comma$0);
   }
-  var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+  var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L15, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
     return { $loc, token: $1 };
   });
   function Comptime(ctx, state2) {
@@ -16668,10 +16682,18 @@ ${counts}`;
     if (options.ast) {
       return ast;
     }
+    function checkErrors() {
+      if (options.errors?.length) {
+        throw new Error(`Parse errors: ${options.errors.map(($) => $.message).join("\n")} `);
+      }
+      ;
+      return;
+    }
     if (options.sourceMap || options.inlineMap) {
       const sm = SourceMap2(src);
       options.updateSourceMap = sm.updateSourceMap;
       const code = generate_default(ast, options);
+      checkErrors();
       if (options.inlineMap) {
         return SourceMap2.remap(code, sm, filename, filename + ".tsx");
       } else {
@@ -16682,9 +16704,7 @@ ${counts}`;
       }
     }
     const result = generate_default(ast, options);
-    if (options.errors?.length) {
-      throw new Error(`Parse errors: ${options.errors.map(($) => $.message).join("\n")} `);
-    }
+    checkErrors();
     return result;
   };
   var makeCache = function({ hits, trace } = {}) {

package/dist/main.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../Hera/dist/machine.js
+// node_modules/@danielx/hera/dist/machine.js
 var require_machine = __commonJS({
-  "../Hera/dist/machine.js"(exports2, module2) {
+  "node_modules/@danielx/hera/dist/machine.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1313,8 +1313,8 @@ function makeBlockFragment() {
 function replaceBlockExpression(node, child, replacement) {
   let found = false;
   const { expressions } = node;
-  for (let i = 0, l = expressions.length; i < l; i++) {
-    const statement = expressions[i];
+  for (let i1 = 0, len2 = expressions.length; i1 < len2; i1++) {
+    const statement = expressions[i1];
     const [, s] = statement;
     if (s === child) {
       statement[1] = replacement;
@@ -1375,9 +1375,9 @@ function processBlocks(statements) {
 }
 function insertSemicolon(statements) {
   const l = statements.length;
-  for (let i1 = 0, len2 = statements.length; i1 < len2; i1++) {
-    const i = i1;
-    const s = statements[i1];
+  for (let i2 = 0, len1 = statements.length; i2 < len1; i2++) {
+    const i = i2;
+    const s = statements[i2];
     if (i < l - 1) {
       if (needsPrecedingSemicolon(statements[i + 1][1])) {
         const delim = s[2];
@@ -1395,8 +1395,8 @@ function needsPrecedingSemicolon(exp) {
     return false;
   }
   if (Array.isArray(exp)) {
-    for (let i2 = 0, len1 = exp.length; i2 < len1; i2++) {
-      const child = exp[i2];
+    for (let i3 = 0, len2 = exp.length; i3 < len2; i3++) {
+      const child = exp[i3];
       if (!(child != null)) {
         continue;
       }
@@ -1457,9 +1457,12 @@ function addParentPointers(node, parent) {
     return;
   }
   node = node;
-  node.parent = parent;
+  if (parent != null) {
+    node.parent = parent;
+  }
   if (node.children) {
-    for (const child of node.children) {
+    for (let ref1 = node.children, i1 = 0, len2 = ref1.length; i1 < len2; i1++) {
+      const child = ref1[i1];
       addParentPointers(child, node);
     }
   }
@@ -1469,10 +1472,9 @@ function clone(node) {
   return deepCopy(node);
 }
 function removeParentPointers(node) {
-  if (node == null)
-    return;
-  if (typeof node !== "object")
+  if (!(node != null && typeof node === "object")) {
     return;
+  }
   if (Array.isArray(node)) {
     for (const child of node) {
       removeParentPointers(child);
@@ -1516,7 +1518,8 @@ function isEmptyBareBlock(node) {
   if (node?.type !== "BlockStatement")
     return false;
   const { bare, expressions } = node;
-  return bare && (expressions.length === 0 || expressions.length === 1 && expressions[0][1]?.type === "EmptyStatement");
+  return bare && //expressions is like [], [, {type: "EmptyStatement"}]
+  (expressions.length === 0 || expressions.length === 1 && expressions[0][1]?.type === "EmptyStatement");
 }
 function isFunction(node) {
   const { type } = node;
@@ -1564,8 +1567,8 @@ function isExit(node) {
   if (!(node != null)) {
     return false;
   }
-  let ref1;
   let ref2;
+  let ref3;
   switch (node.type) {
     case "ReturnStatement":
     case "ThrowStatement":
@@ -1574,10 +1577,10 @@ function isExit(node) {
       return true;
     }
     case "IfStatement": {
-      return isExit(node.then) && isExit((ref1 = node.else)?.[ref1.length - 1]);
+      return isExit(node.then) && isExit((ref2 = node.else)?.[ref2.length - 1]);
     }
     case "BlockStatement": {
-      return isExit((ref2 = node.expressions)[ref2.length - 1]?.[1]);
+      return isExit((ref3 = node.expressions)[ref3.length - 1]?.[1]);
     }
     case "IterationStatement": {
       return node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true" && gatherRecursiveWithinFunction(
@@ -1873,8 +1876,8 @@ function updateParentPointers(node, parent, depth = 1) {
     return;
   }
   if (Array.isArray(node)) {
-    for (let i1 = 0, len2 = node.length; i1 < len2; i1++) {
-      const child = node[i1];
+    for (let i2 = 0, len1 = node.length; i2 < len1; i2++) {
+      const child = node[i2];
       updateParentPointers(child, parent, depth);
     }
     return;
@@ -1884,8 +1887,8 @@ function updateParentPointers(node, parent, depth = 1) {
     node.parent = parent;
   }
   if (depth && isParent(node)) {
-    for (let ref3 = node.children, i2 = 0, len1 = ref3.length; i2 < len1; i2++) {
-      const child = ref3[i2];
+    for (let ref4 = node.children, i3 = 0, len2 = ref4.length; i3 < len2; i3++) {
+      const child = ref4[i3];
       updateParentPointers(child, node, depth - 1);
     }
   }
@@ -2015,9 +2018,9 @@ function wrapWithReturn(expression) {
 }
 function flatJoin(array, separator) {
   const result = [];
-  for (let i3 = 0, len2 = array.length; i3 < len2; i3++) {
-    const i = i3;
-    const items = array[i3];
+  for (let i4 = 0, len3 = array.length; i4 < len3; i4++) {
+    const i = i4;
+    const items = array[i4];
     if (i) {
       result.push(separator);
     }
@@ -2068,8 +2071,9 @@ function findAncestor(node, predicate, stopPredicate) {
   return { ancestor: void 0, child: node };
 }
 function gatherNodes(node, predicate) {
-  if (node == null)
+  if (node == null || typeof node === "string") {
     return [];
+  }
   if (Array.isArray(node)) {
     return node.flatMap((n) => gatherNodes(n, predicate));
   }
@@ -2077,24 +2081,30 @@ function gatherNodes(node, predicate) {
     return [node];
   }
   switch (node.type) {
-    case "BlockStatement":
+    case "BlockStatement": {
       return [];
-    case "ForStatement":
+    }
+    case "ForStatement": {
       const isDec = node.declaration?.type === "Declaration";
       return node.children.flatMap((n) => {
-        if (isDec && n === node.declaration)
+        if (isDec && n === node.declaration) {
           return [];
-        return gatherNodes(n, predicate);
+        } else {
+          return gatherNodes(n, predicate);
+        }
       });
-    default:
+    }
+    default: {
       return gatherNodes(node.children, predicate);
+    }
   }
 }
 function gatherRecursive(node, predicate, skipPredicate) {
-  if (node == null)
+  if (node == null || typeof node === "string") {
     return [];
+  }
   if (Array.isArray(node)) {
-    return node.flatMap((n) => gatherRecursive(n, predicate, skipPredicate));
+    return node.flatMap(($) => gatherRecursive($, predicate, skipPredicate));
   }
   if (skipPredicate?.(node))
     return [];
@@ -2104,8 +2114,9 @@ function gatherRecursive(node, predicate, skipPredicate) {
   return gatherRecursive(node.children, predicate, skipPredicate);
 }
 function gatherRecursiveAll(node, predicate) {
-  if (node == null)
+  if (node == null || typeof node === "string") {
     return [];
+  }
   if (Array.isArray(node)) {
     return node.flatMap((n) => gatherRecursiveAll(n, predicate));
   }
@@ -3154,9 +3165,12 @@ function processDeclarationCondition(condition, rootCondition, parent) {
   rootCondition.blockPrefix = getPatternBlockPrefix(pattern, ref, decl, suffix);
 }
 function processDeclarationConditions(node) {
-  gatherRecursiveAll(node, (n) => {
-    return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
-  }).forEach((s) => {
+  gatherRecursiveAll(
+    node,
+    (n) => {
+      return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
+    }
+  ).forEach((s) => {
     return processDeclarationConditionStatement(s);
   });
 }
@@ -7262,8 +7276,8 @@ var SingleLineBinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, impor
 function SingleLineBinaryOpRHS(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "SingleLineBinaryOpRHS", SingleLineBinaryOpRHS$0);
 }
-var RHS$0 = UnaryExpression;
-var RHS$1 = ExpressionizedStatementWithTrailingCallExpressions;
+var RHS$0 = ExpressionizedStatementWithTrailingCallExpressions;
+var RHS$1 = UnaryExpression;
 var RHS$$ = [RHS$0, RHS$1];
 function RHS(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "RHS", RHS$$);
@@ -13519,7 +13533,7 @@ var Comma$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L25, 'Comma ","'),
 function Comma(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Comma", Comma$0);
 }
-var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L15, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: $1 };
 });
 function Comptime(ctx, state2) {
@@ -16661,10 +16675,18 @@ ${counts}`;
   if (options.ast) {
     return ast;
   }
+  function checkErrors() {
+    if (options.errors?.length) {
+      throw new Error(`Parse errors: ${options.errors.map(($) => $.message).join("\n")} `);
+    }
+    ;
+    return;
+  }
   if (options.sourceMap || options.inlineMap) {
     const sm = SourceMap2(src);
     options.updateSourceMap = sm.updateSourceMap;
     const code = generate_default(ast, options);
+    checkErrors();
     if (options.inlineMap) {
       return SourceMap2.remap(code, sm, filename, filename + ".tsx");
     } else {
@@ -16675,9 +16697,7 @@ ${counts}`;
     }
   }
   const result = generate_default(ast, options);
-  if (options.errors?.length) {
-    throw new Error(`Parse errors: ${options.errors.map(($) => $.message).join("\n")} `);
-  }
+  checkErrors();
   return result;
 };
 var makeCache = function({ hits, trace } = {}) {

package/dist/main.mjs

@@ -28,9 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../Hera/dist/machine.js
+// node_modules/@danielx/hera/dist/machine.js
 var require_machine = __commonJS({
-  "../Hera/dist/machine.js"(exports, module) {
+  "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1297,8 +1297,8 @@ function makeBlockFragment() {
 function replaceBlockExpression(node, child, replacement) {
   let found = false;
   const { expressions } = node;
-  for (let i = 0, l = expressions.length; i < l; i++) {
-    const statement = expressions[i];
+  for (let i1 = 0, len2 = expressions.length; i1 < len2; i1++) {
+    const statement = expressions[i1];
     const [, s] = statement;
     if (s === child) {
       statement[1] = replacement;
@@ -1359,9 +1359,9 @@ function processBlocks(statements) {
 }
 function insertSemicolon(statements) {
   const l = statements.length;
-  for (let i1 = 0, len2 = statements.length; i1 < len2; i1++) {
-    const i = i1;
-    const s = statements[i1];
+  for (let i2 = 0, len1 = statements.length; i2 < len1; i2++) {
+    const i = i2;
+    const s = statements[i2];
     if (i < l - 1) {
       if (needsPrecedingSemicolon(statements[i + 1][1])) {
         const delim = s[2];
@@ -1379,8 +1379,8 @@ function needsPrecedingSemicolon(exp) {
     return false;
   }
   if (Array.isArray(exp)) {
-    for (let i2 = 0, len1 = exp.length; i2 < len1; i2++) {
-      const child = exp[i2];
+    for (let i3 = 0, len2 = exp.length; i3 < len2; i3++) {
+      const child = exp[i3];
       if (!(child != null)) {
         continue;
       }
@@ -1441,9 +1441,12 @@ function addParentPointers(node, parent) {
     return;
   }
   node = node;
-  node.parent = parent;
+  if (parent != null) {
+    node.parent = parent;
+  }
   if (node.children) {
-    for (const child of node.children) {
+    for (let ref1 = node.children, i1 = 0, len2 = ref1.length; i1 < len2; i1++) {
+      const child = ref1[i1];
       addParentPointers(child, node);
     }
   }
@@ -1453,10 +1456,9 @@ function clone(node) {
   return deepCopy(node);
 }
 function removeParentPointers(node) {
-  if (node == null)
-    return;
-  if (typeof node !== "object")
+  if (!(node != null && typeof node === "object")) {
     return;
+  }
   if (Array.isArray(node)) {
     for (const child of node) {
       removeParentPointers(child);
@@ -1500,7 +1502,8 @@ function isEmptyBareBlock(node) {
   if (node?.type !== "BlockStatement")
     return false;
   const { bare, expressions } = node;
-  return bare && (expressions.length === 0 || expressions.length === 1 && expressions[0][1]?.type === "EmptyStatement");
+  return bare && //expressions is like [], [, {type: "EmptyStatement"}]
+  (expressions.length === 0 || expressions.length === 1 && expressions[0][1]?.type === "EmptyStatement");
 }
 function isFunction(node) {
   const { type } = node;
@@ -1548,8 +1551,8 @@ function isExit(node) {
   if (!(node != null)) {
     return false;
   }
-  let ref1;
   let ref2;
+  let ref3;
   switch (node.type) {
     case "ReturnStatement":
     case "ThrowStatement":
@@ -1558,10 +1561,10 @@ function isExit(node) {
       return true;
     }
     case "IfStatement": {
-      return isExit(node.then) && isExit((ref1 = node.else)?.[ref1.length - 1]);
+      return isExit(node.then) && isExit((ref2 = node.else)?.[ref2.length - 1]);
     }
     case "BlockStatement": {
-      return isExit((ref2 = node.expressions)[ref2.length - 1]?.[1]);
+      return isExit((ref3 = node.expressions)[ref3.length - 1]?.[1]);
     }
     case "IterationStatement": {
       return node.condition?.type === "ParenthesizedExpression" && node.condition.expression?.type === "Literal" && node.condition.expression?.raw === "true" && gatherRecursiveWithinFunction(
@@ -1857,8 +1860,8 @@ function updateParentPointers(node, parent, depth = 1) {
     return;
   }
   if (Array.isArray(node)) {
-    for (let i1 = 0, len2 = node.length; i1 < len2; i1++) {
-      const child = node[i1];
+    for (let i2 = 0, len1 = node.length; i2 < len1; i2++) {
+      const child = node[i2];
       updateParentPointers(child, parent, depth);
     }
     return;
@@ -1868,8 +1871,8 @@ function updateParentPointers(node, parent, depth = 1) {
     node.parent = parent;
   }
   if (depth && isParent(node)) {
-    for (let ref3 = node.children, i2 = 0, len1 = ref3.length; i2 < len1; i2++) {
-      const child = ref3[i2];
+    for (let ref4 = node.children, i3 = 0, len2 = ref4.length; i3 < len2; i3++) {
+      const child = ref4[i3];
       updateParentPointers(child, node, depth - 1);
     }
   }
@@ -1999,9 +2002,9 @@ function wrapWithReturn(expression) {
 }
 function flatJoin(array, separator) {
   const result = [];
-  for (let i3 = 0, len2 = array.length; i3 < len2; i3++) {
-    const i = i3;
-    const items = array[i3];
+  for (let i4 = 0, len3 = array.length; i4 < len3; i4++) {
+    const i = i4;
+    const items = array[i4];
     if (i) {
       result.push(separator);
     }
@@ -2052,8 +2055,9 @@ function findAncestor(node, predicate, stopPredicate) {
   return { ancestor: void 0, child: node };
 }
 function gatherNodes(node, predicate) {
-  if (node == null)
+  if (node == null || typeof node === "string") {
     return [];
+  }
   if (Array.isArray(node)) {
     return node.flatMap((n) => gatherNodes(n, predicate));
   }
@@ -2061,24 +2065,30 @@ function gatherNodes(node, predicate) {
     return [node];
   }
   switch (node.type) {
-    case "BlockStatement":
+    case "BlockStatement": {
       return [];
-    case "ForStatement":
+    }
+    case "ForStatement": {
       const isDec = node.declaration?.type === "Declaration";
       return node.children.flatMap((n) => {
-        if (isDec && n === node.declaration)
+        if (isDec && n === node.declaration) {
           return [];
-        return gatherNodes(n, predicate);
+        } else {
+          return gatherNodes(n, predicate);
+        }
       });
-    default:
+    }
+    default: {
       return gatherNodes(node.children, predicate);
+    }
   }
 }
 function gatherRecursive(node, predicate, skipPredicate) {
-  if (node == null)
+  if (node == null || typeof node === "string") {
     return [];
+  }
   if (Array.isArray(node)) {
-    return node.flatMap((n) => gatherRecursive(n, predicate, skipPredicate));
+    return node.flatMap(($) => gatherRecursive($, predicate, skipPredicate));
   }
   if (skipPredicate?.(node))
     return [];
@@ -2088,8 +2098,9 @@ function gatherRecursive(node, predicate, skipPredicate) {
   return gatherRecursive(node.children, predicate, skipPredicate);
 }
 function gatherRecursiveAll(node, predicate) {
-  if (node == null)
+  if (node == null || typeof node === "string") {
     return [];
+  }
   if (Array.isArray(node)) {
     return node.flatMap((n) => gatherRecursiveAll(n, predicate));
   }
@@ -3138,9 +3149,12 @@ function processDeclarationCondition(condition, rootCondition, parent) {
   rootCondition.blockPrefix = getPatternBlockPrefix(pattern, ref, decl, suffix);
 }
 function processDeclarationConditions(node) {
-  gatherRecursiveAll(node, (n) => {
-    return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
-  }).forEach((s) => {
+  gatherRecursiveAll(
+    node,
+    (n) => {
+      return n.type === "IfStatement" || n.type === "IterationStatement" || n.type === "SwitchStatement";
+    }
+  ).forEach((s) => {
     return processDeclarationConditionStatement(s);
   });
 }
@@ -7246,8 +7260,8 @@ var SingleLineBinaryOpRHS$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, impor
 function SingleLineBinaryOpRHS(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "SingleLineBinaryOpRHS", SingleLineBinaryOpRHS$0);
 }
-var RHS$0 = UnaryExpression;
-var RHS$1 = ExpressionizedStatementWithTrailingCallExpressions;
+var RHS$0 = ExpressionizedStatementWithTrailingCallExpressions;
+var RHS$1 = UnaryExpression;
 var RHS$$ = [RHS$0, RHS$1];
 function RHS(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "RHS", RHS$$);
@@ -13503,7 +13517,7 @@ var Comma$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L25, 'Comma ","'),
 function Comma(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "Comma", Comma$0);
 }
-var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var Comptime$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L138, 'Comptime "comptime"'), NonIdContinue, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L15, 'Comptime ":"'))), function($skip, $loc, $0, $1, $2, $3) {
   return { $loc, token: $1 };
 });
 function Comptime(ctx, state2) {
@@ -16645,10 +16659,18 @@ ${counts}`;
   if (options.ast) {
     return ast;
   }
+  function checkErrors() {
+    if (options.errors?.length) {
+      throw new Error(`Parse errors: ${options.errors.map(($) => $.message).join("\n")} `);
+    }
+    ;
+    return;
+  }
   if (options.sourceMap || options.inlineMap) {
     const sm = SourceMap2(src);
     options.updateSourceMap = sm.updateSourceMap;
     const code = generate_default(ast, options);
+    checkErrors();
     if (options.inlineMap) {
       return SourceMap2.remap(code, sm, filename, filename + ".tsx");
     } else {
@@ -16659,9 +16681,7 @@ ${counts}`;
     }
   }
   const result = generate_default(ast, options);
-  if (options.errors?.length) {
-    throw new Error(`Parse errors: ${options.errors.map(($) => $.message).join("\n")} `);
-  }
+  checkErrors();
   return result;
 };
 var makeCache = function({ hits, trace } = {}) {

package/package.json

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