@danielx/civet 0.8.0 → 0.8.1

package/CHANGELOG.md

@@ -4,6 +4,19 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.8.1 (2024-10-13, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.0...v0.8.1), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.1))
+* Fix `catch` type annotation by forbidding indented type arguments in `catch` [[#1446](https://github.com/DanielXMoore/Civet/pull/1446)]
+* Require parentheses in complex `&` type annotation [[#1447](https://github.com/DanielXMoore/Civet/pull/1447)]
+  * BREAKING CHANGE: `&: number | string` is now treated as `(&: number) | string`, and `&: T ? a : b` is consistently treated as `(&: T) ? a : b`
+* CLI exposes top-level declarations with top-level `await` [[#1448](https://github.com/DanielXMoore/Civet/pull/1448)]
+* `.d.ts` matches output extension in CLI; `declarationExtension` option in unplugin [[#1451](https://github.com/DanielXMoore/Civet/pull/1451)]
+* Fix CLI executing ESM code from stdin or `-e` [[#1454](https://github.com/DanielXMoore/Civet/pull/1454)]
+* CLI REPL supports (strips) TypeScript [[#1453](https://github.com/DanielXMoore/Civet/pull/1453)]
+* Variance annotations (`in`/`out`) in type parameters [[#1459](https://github.com/DanielXMoore/Civet/pull/1459)]
+* Allow pipes etc. in explicit function arguments [[#1460](https://github.com/DanielXMoore/Civet/pull/1460)]
+* Pipeline doesn't unwrap in multi-`&` function shorthand [[#1462](https://github.com/DanielXMoore/Civet/pull/1462)]
+* Add missing parentheses with `++` concat operator [[#1461](https://github.com/DanielXMoore/Civet/pull/1461)]
+
 ## 0.8.0 (2024-10-10, [diff](https://github.com/DanielXMoore/Civet/compare/v0.7.36...v0.8.0), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.0))
 * Assigned expressionized statement followed by pipe, grammar cleanup [[#1442](https://github.com/DanielXMoore/Civet/pull/1442)]
 * `yield` in `do` yields in parent in all cases [[#1443](https://github.com/DanielXMoore/Civet/pull/1443)]

package/dist/browser.js

@@ -38,9 +38,9 @@ var Civet = (() => {
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // node_modules/@danielx/hera/dist/machine.js
+  // node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js
   var require_machine = __commonJS({
-    "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+    "node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js"(exports, module) {
       "use strict";
       var __defProp2 = Object.defineProperty;
       var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -70,7 +70,7 @@ var Civet = (() => {
         $N: () => $N2,
         $P: () => $P2,
         $Q: () => $Q2,
-        $R: () => $R99,
+        $R: () => $R100,
         $R$0: () => $R$02,
         $S: () => $S2,
         $T: () => $T2,
@@ -107,7 +107,7 @@ var Civet = (() => {
           return;
         };
       }
-      function $R99(regExp) {
+      function $R100(regExp) {
         return function(_ctx, state2) {
           const { input, pos } = state2;
           regExp.lastIndex = state2.pos;
@@ -543,6 +543,7 @@ ${body}`;
     getPrecedence: () => getPrecedence,
     getTrimmingSpace: () => getTrimmingSpace,
     hasAwait: () => hasAwait,
+    hasExportDeclaration: () => hasExportDeclaration,
     hasImportDeclaration: () => hasImportDeclaration,
     hasYield: () => hasYield,
     insertTrimmingSpace: () => insertTrimmingSpace,
@@ -993,6 +994,9 @@ ${body}`;
   function hasImportDeclaration(exp) {
     return gatherRecursiveWithinFunction(exp, ($3) => $3.type === "ImportDeclaration").length > 0;
   }
+  function hasExportDeclaration(exp) {
+    return gatherRecursiveWithinFunction(exp, ($4) => $4.type === "ExportDeclaration").length > 0;
+  }
   function deepCopy(node) {
     if (node == null)
       return node;
@@ -1031,6 +1035,7 @@ ${body}`;
   }
   var skipParens = /* @__PURE__ */ new Set([
     "AmpersandRef",
+    "ArrayExpression",
     "CallExpression",
     "Identifier",
     "JSXElement",
@@ -1044,6 +1049,10 @@ ${body}`;
     // wrapIIFE
   ]);
   function makeLeftHandSideExpression(expression) {
+    while (expression && Array.isArray(expression) && len(expression, 1)) {
+      const [item] = expression;
+      expression = item;
+    }
     if (isASTNodeObject(expression)) {
       if (expression.parenthesized) {
         return expression;
@@ -1051,7 +1060,7 @@ ${body}`;
       if (skipParens.has(expression.type)) {
         return expression;
       }
-      if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($4) => $4.type === "ObjectExpression")) {
+      if (expression.type === "MemberExpression" && !startsWithPredicate(expression, ($5) => $5.type === "ObjectExpression")) {
         return expression;
       }
     }
@@ -2431,7 +2440,12 @@ ${body}`;
     if (isStatement(body)) {
       braceBlock(block);
       fn.ampersandBlock = false;
-      delete fn.body;
+    }
+    if (gatherRecursiveWithinFunction(
+      block,
+      (a4) => a4 === ref
+    ).length > 1) {
+      fn.ampersandBlock = false;
     }
     return fn;
   }
@@ -2794,7 +2808,7 @@ ${body}`;
             a = makeAsConst(a);
             b = makeAsConst(b);
           }
-          let children;
+          let children, type;
           if (op.type === "PatternTest") {
             children = [processPatternTest(a, b)];
           } else if (op.type === "ChainOp") {
@@ -2803,28 +2817,31 @@ ${body}`;
               children = ["(", ...children, ")"];
             }
           } else if (op.call) {
-            wsOp = insertTrimmingSpace(wsOp, "");
+            wsOp = trimFirstSpace(wsOp);
             if (op.reversed) {
-              wsB = insertTrimmingSpace(wsB, "");
+              wsB = trimFirstSpace(wsB);
               children = [wsOp, op.call, "(", wsB, b, ", ", a, ")", op.suffix];
             } else {
               children = [wsOp, op.call, "(", a, ",", wsB, b, ")", op.suffix];
             }
+            type = "CallExpression";
           } else if (op.method) {
-            wsOp = insertTrimmingSpace(wsOp, "");
-            wsB = insertTrimmingSpace(wsB, "");
+            wsOp = trimFirstSpace(wsOp);
+            wsB = trimFirstSpace(wsB);
             if (op.reversed) {
-              if (end !== i + 2)
+              if (!(b.type === "CallExpression")) {
                 b = makeLeftHandSideExpression(b);
+              }
               b = dotNumericLiteral(b);
               children = [wsB, b, wsOp, ".", op.method, "(", a, ")"];
             } else {
-              if (start !== i - 2 || a.type === "NumericLiteral") {
+              if (!(a.type === "CallExpression")) {
                 a = makeLeftHandSideExpression(a);
               }
               a = dotNumericLiteral(a);
               children = [a, wsOp, ".", op.method, "(", wsB, b, ")"];
             }
+            type = "CallExpression";
           } else if (op.token) {
             children = [a, wsOp, op, wsB, b];
             if (op.negated)
@@ -2838,6 +2855,7 @@ ${body}`;
             children.push(error);
           }
           expandedOps.splice(start, end - start + 1, {
+            type,
             children
           });
           i = start + 2;
@@ -4843,8 +4861,9 @@ ${body}`;
           let line = "?";
           let column = "?";
           let offset;
-          if (options && typeof options === "object" && "sourceMap" in options) {
-            const { sourceMap } = options;
+          let ref;
+          if (ref = options.sourceMap) {
+            const sourceMap = ref;
             line = sourceMap.data.srcLine + 1;
             column = sourceMap.data.srcColumn + 1;
             offset = sourceMap.data.srcOffset;
@@ -7530,6 +7549,7 @@ ${js}`
     TypeIndex,
     TypeSuffix,
     MaybeNestedType,
+    MaybeNestedTypePrimary,
     ReturnTypeSuffix,
     ReturnType,
     TypePredicate,
@@ -7986,14 +8006,15 @@ ${js}`
   var $R88 = (0, import_lib3.$R)(new RegExp("(?=if|unless)", "suy"));
   var $R89 = (0, import_lib3.$R)(new RegExp("[|&<!=\\-\u21D2\u2192]", "suy"));
   var $R90 = (0, import_lib3.$R)(new RegExp("(extends|not|is)(?!\\p{ID_Continue}|[\\u200C\\u200D$])", "suy"));
-  var $R91 = (0, import_lib3.$R)(new RegExp("#![^\\r\\n]*", "suy"));
-  var $R92 = (0, import_lib3.$R)(new RegExp("[\\t ]*", "suy"));
-  var $R93 = (0, import_lib3.$R)(new RegExp("[\\s]*", "suy"));
-  var $R94 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?", "suy"));
-  var $R95 = (0, import_lib3.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
-  var $R96 = (0, import_lib3.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
-  var $R97 = (0, import_lib3.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-  var $R98 = (0, import_lib3.$R)(new RegExp("[^]*", "suy"));
+  var $R91 = (0, import_lib3.$R)(new RegExp("const|in|out", "suy"));
+  var $R92 = (0, import_lib3.$R)(new RegExp("#![^\\r\\n]*", "suy"));
+  var $R93 = (0, import_lib3.$R)(new RegExp("[\\t ]*", "suy"));
+  var $R94 = (0, import_lib3.$R)(new RegExp("[\\s]*", "suy"));
+  var $R95 = (0, import_lib3.$R)(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?", "suy"));
+  var $R96 = (0, import_lib3.$R)(new RegExp("\\/\\/\\/[^\\r\\n]*", "suy"));
+  var $R97 = (0, import_lib3.$R)(new RegExp("(?=[ \\t\\r\\n\\/#]|$)", "suy"));
+  var $R98 = (0, import_lib3.$R)(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+  var $R99 = (0, import_lib3.$R)(new RegExp("[^]*", "suy"));
   var Program$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Reset, Init, (0, import_lib3.$E)(EOS), TopLevelStatements, __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var reset = $1;
     var init = $2;
@@ -8172,11 +8193,11 @@ ${js}`
   function ImplicitArguments(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ImplicitArguments", ImplicitArguments$0);
   }
-  var ExplicitArguments$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, (0, import_lib3.$E)((0, import_lib3.$S)(ArgumentList, (0, import_lib3.$E)((0, import_lib3.$S)(__, Comma)))), __, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var ExplicitArguments$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenParen, AllowAll, (0, import_lib3.$E)((0, import_lib3.$S)(ArgumentList, (0, import_lib3.$E)((0, import_lib3.$S)(__, Comma)))), __, RestoreAll, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
     var open = $1;
-    var args = $2;
-    var ws = $3;
-    var close = $4;
+    var args = $3;
+    var ws = $4;
+    var close = $6;
     if (args) {
       if (args[1]) {
         args = [...args[0], args[1]];
@@ -8935,8 +8956,10 @@ ${js}`
   function Placeholder(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "Placeholder", Placeholder$$);
   }
-  var PlaceholderTypeSuffix$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)(QuestionMark), Colon)), TypeSuffix), function(value) {
-    return value[1];
+  var PlaceholderTypeSuffix$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$E)(QuestionMark), Colon, MaybeNestedTypePrimary), function(value) {
+    var optional = value[0];
+    var t = value[2];
+    return { "type": "TypeSuffix", "ts": true, "optional": optional, "t": t, "children": value };
   });
   function PlaceholderTypeSuffix(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "PlaceholderTypeSuffix", PlaceholderTypeSuffix$0);
@@ -13649,7 +13672,15 @@ ${js}`
     return (0, import_lib3.$EVENT)(ctx, state2, "CatchClause", CatchClause$0);
   }
   var CatchBind$0 = (0, import_lib3.$S)((0, import_lib3.$E)(_), OpenParen, __, CatchParameter, __, CloseParen);
-  var CatchBind$1 = (0, import_lib3.$S)(_, InsertOpenParen, (0, import_lib3.$N)(EOS), CatchParameter, InsertCloseParen);
+  var CatchBind$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(_, InsertOpenParen, (0, import_lib3.$N)(EOS), ForbidIndentedApplication, (0, import_lib3.$E)(CatchParameter), RestoreIndentedApplication, InsertCloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+    var ws = $1;
+    var open = $2;
+    var param = $5;
+    var close = $7;
+    if (!param)
+      return $skip;
+    return [ws, open, param, close];
+  });
   var CatchBind$$ = [CatchBind$0, CatchBind$1];
   function CatchBind(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "CatchBind", CatchBind$$);
@@ -17055,6 +17086,19 @@ ${js}`
   function MaybeNestedType(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedType", MaybeNestedType$$);
   }
+  var MaybeNestedTypePrimary$0 = NestedTypeBulletedTuple;
+  var MaybeNestedTypePrimary$1 = NestedInterfaceBlock;
+  var MaybeNestedTypePrimary$2 = NestedTypeBinaryChain;
+  var MaybeNestedTypePrimary$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$E)((0, import_lib3.$S)(Nested, Type)), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    if (!$2)
+      return $skip;
+    return $2;
+  });
+  var MaybeNestedTypePrimary$4 = TypePrimary;
+  var MaybeNestedTypePrimary$$ = [MaybeNestedTypePrimary$0, MaybeNestedTypePrimary$1, MaybeNestedTypePrimary$2, MaybeNestedTypePrimary$3, MaybeNestedTypePrimary$4];
+  function MaybeNestedTypePrimary(ctx, state2) {
+    return (0, import_lib3.$EVENT_C)(ctx, state2, "MaybeNestedTypePrimary", MaybeNestedTypePrimary$$);
+  }
   var ReturnTypeSuffix$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$E)(QuestionMark), (0, import_lib3.$E)(_), Colon, ReturnType), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var optional = $2;
     var t = $5;
@@ -17762,7 +17806,7 @@ ${js}`
   function TypeParameters(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeParameters", TypeParameters$0);
   }
-  var TypeParameter$0 = (0, import_lib3.$S)(__, (0, import_lib3.$E)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L173, 'TypeParameter "const"'), (0, import_lib3.$E)(_))), Identifier, (0, import_lib3.$E)(TypeConstraint), (0, import_lib3.$E)(TypeInitializer), TypeParameterDelimiter);
+  var TypeParameter$0 = (0, import_lib3.$S)(__, (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R91, "TypeParameter /const|in|out/")), _)), Identifier, (0, import_lib3.$E)(TypeConstraint), (0, import_lib3.$E)(TypeInitializer), TypeParameterDelimiter);
   function TypeParameter(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TypeParameter", TypeParameter$0);
   }
@@ -17789,15 +17833,15 @@ ${js}`
   function ThisType(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ThisType", ThisType$0);
   }
-  var Shebang$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R91, "Shebang /#![^\\r\\n]*/")), EOL);
+  var Shebang$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R92, "Shebang /#![^\\r\\n]*/")), EOL);
   function Shebang(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Shebang", Shebang$0);
   }
-  var CivetPrologue$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R92, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
+  var CivetPrologue$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R93, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
     var content = value[2];
     return content;
   });
-  var CivetPrologue$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R92, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
+  var CivetPrologue$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R93, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, SimpleStatementDelimiter, (0, import_lib3.$EXPECT)($R20, "CivetPrologue /[ \\t]*/"), (0, import_lib3.$C)(EOL, (0, import_lib3.$Y)(RestOfLine))), function(value) {
     var content = value[2];
     return content;
   });
@@ -17805,7 +17849,7 @@ ${js}`
   function CivetPrologue(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "CivetPrologue", CivetPrologue$$);
   }
-  var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L238, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R93, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var CivetPrologueContent$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L238, 'CivetPrologueContent "civet"'), NonIdContinue, (0, import_lib3.$Q)(CivetOption), (0, import_lib3.$EXPECT)($R94, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3, $4) {
     var options = $3;
     return {
       type: "CivetPrologue",
@@ -17816,7 +17860,7 @@ ${js}`
   function CivetPrologueContent(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "CivetPrologueContent", CivetPrologueContent$0);
   }
-  var CivetOption$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R94, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var CivetOption$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R95, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([\\p{ID_Continue}.,+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
       if (l)
         return l.toUpperCase();
@@ -17838,11 +17882,11 @@ ${js}`
   function CivetOption(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "CivetOption", CivetOption$0);
   }
-  var UnknownPrologue$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R92, "UnknownPrologue /[\\t ]*/")), StringLiteral, (0, import_lib3.$TEXT)(SimpleStatementDelimiter), EOS);
+  var UnknownPrologue$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R93, "UnknownPrologue /[\\t ]*/")), StringLiteral, (0, import_lib3.$TEXT)(SimpleStatementDelimiter), EOS);
   function UnknownPrologue(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "UnknownPrologue", UnknownPrologue$0);
   }
-  var TripleSlashDirective$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R95, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), (0, import_lib3.$E)(EOS));
+  var TripleSlashDirective$0 = (0, import_lib3.$S)((0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R96, "TripleSlashDirective /\\/\\/\\/[^\\r\\n]*/")), (0, import_lib3.$E)(EOS));
   function TripleSlashDirective(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "TripleSlashDirective", TripleSlashDirective$0);
   }
@@ -17858,13 +17902,13 @@ ${js}`
   function PrologueString(ctx, state2) {
     return (0, import_lib3.$EVENT_C)(ctx, state2, "PrologueString", PrologueString$$);
   }
-  var EOS$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R96, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), (0, import_lib3.$P)(RestOfLine)), function(value) {
+  var EOS$0 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($R97, "EOS /(?=[ \\t\\r\\n\\/#]|$)/"), (0, import_lib3.$P)(RestOfLine)), function(value) {
     return value[1];
   });
   function EOS(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "EOS", EOS$0);
   }
-  var EOL$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R97, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var EOL$0 = (0, import_lib3.$TR)((0, import_lib3.$EXPECT)($R98, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     return { $loc, token: $0 };
   });
   function EOL(ctx, state2) {
@@ -18264,7 +18308,7 @@ ${js}`
   function Prologue(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "Prologue", Prologue$0);
   }
-  var ProloguePrefix$0 = (0, import_lib3.$S)(Prologue, (0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R98, "ProloguePrefix /[^]*/")));
+  var ProloguePrefix$0 = (0, import_lib3.$S)(Prologue, (0, import_lib3.$R$0)((0, import_lib3.$EXPECT)($R99, "ProloguePrefix /[^]*/")));
   function ProloguePrefix(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ProloguePrefix", ProloguePrefix$0);
   }

package/dist/civet

@@ -419,26 +419,35 @@ ${" ".repeat(error.column - 1)}^ ${error.header}`);
             prefix + (coffee ? "(do ->\n" : "async do\n") + rest.replace(/^/gm, " ") + (coffee ? ")" : ""),
             { ...options, filename, ast: true }
           );
-          import_main.lib.gatherRecursive(ast, ($) => $.type === "BlockStatement").forEach((topBlock) => {
-            return import_main.lib.gatherRecursiveWithinFunction(topBlock, ($1) => $1.type === "Declaration").forEach((decl) => {
-              const type = decl.children.shift();
+          let ref1;
+          if (coffee) {
+            ref1 = import_main.lib.gatherRecursive(ast.children, ($) => $.type === "BlockStatement")[0];
+          } else {
+            ref1 = import_main.lib.gatherRecursive(ast.children, ($1) => $1.type === "DoStatement")[0].block;
+          }
+          ;
+          const topBlock = ref1;
+          for (let ref2 = topBlock.expressions, i3 = 0, len2 = ref2.length; i3 < len2; i3++) {
+            const [, statement] = ref2[i3];
+            if (typeof statement === "object" && statement != null && "type" in statement && statement.type === "Declaration") {
+              statement.children.shift();
               if (!Array.isArray(ast)) {
                 ast = [ast];
               }
-              return ast.unshift(`var ${decl.names.join(",")};`);
-            });
-          });
+              ast.unshift(`var ${statement.names.join(",")};`);
+            }
+          }
         }
         let errors = [];
         try {
-          output = (0, import_main.generate)(ast, { errors });
+          output = (0, import_main.generate)(ast, { ...options, errors, sourceMap: void 0 });
         } catch (error) {
           console.error(error);
           return callback(null, void 0);
         }
         if (errors.length) {
           errors = [];
-          (0, import_main.generate)(ast, { errors, sourceMap: (0, import_main.SourceMap)(input) });
+          (0, import_main.generate)(ast, { ...options, errors, sourceMap: (0, import_main.SourceMap)(input) });
           showError2(errors[0]);
           return callback(null, void 0);
         }
@@ -546,7 +555,8 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
     const unpluginOptions = {
       ...options,
       ts: options.js ? "civet" : "preserve",
-      outputExtension: ".tsx"
+      outputExtension: ".tsx",
+      declarationExtension: options.outputExt?.replace(/\.[jt]sx?$/i, ".d.ts")
     };
     (unpluginOptions.parseOptions ??= {}).rewriteCivetImports = ".civet.jsx";
     unplugin = (0, import_unplugin.rawPlugin)(unpluginOptions, { framework: "civet-cli" });
@@ -559,8 +569,16 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
   if (options.repl) {
     return repl(args, options);
   }
+  process.stdout.on("error", (e) => {
+    if (["EPIPE", "EOF"].includes(e.code)) {
+      return process.exit(0);
+    } else {
+      console.error(e);
+      return process.exit(1);
+    }
+  });
   let errors = 0;
-  for await (const { filename, error, content, stdin } of readFiles(filenames, options.eval)) {
+  for await (let { filename, error, content, stdin } of readFiles(filenames, options.eval)) {
     if (error) {
       console.error(`${filename} failed to load:`);
       console.error(error);
@@ -583,14 +601,6 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
       errors++;
       continue;
     }
-    process.stdout.on("error", (e) => {
-      if (["EPIPE", "EOF"].includes(e.code)) {
-        return process.exit(0);
-      } else {
-        console.error(e);
-        return process.exit(1);
-      }
-    });
     if (options.ast) {
       process.stdout.write(JSON.stringify(output, null, 2));
     } else if (options.compile) {
@@ -626,14 +636,24 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
         }
       }
     } else if (options.run) {
-      const esm = /^\s*(import|export)\b/m.test(output);
+      let ref3;
+      {
+        if (typeof output === "string" && /\b(await|import|export)\b/.test(output)) {
+          const ast = await (0, import_main.compile)(content, { ...options, ast: true, filename });
+          ref3 = import_main.lib.hasAwait(ast) || import_main.lib.hasImportDeclaration(ast) || import_main.lib.hasExportDeclaration(ast);
+        } else {
+          ref3 = void 0;
+        }
+      }
+      ;
+      const esm = ref3;
       if (esm) {
         if (stdin) {
-          const filename2 = `.stdin-${process.pid}.civet`;
+          filename = `.stdin-${process.pid}.civet`;
           try {
-            await import_promises.default.writeFile(filename2, content, { encoding });
+            await import_promises.default.writeFile(filename, content, { encoding });
           } catch (e) {
-            console.error(`Could not write ${filename2} for Civet ESM mode:`);
+            console.error(`Could not write ${filename} for Civet ESM mode:`);
             console.error(e);
             process.exit(1);
           }
@@ -706,9 +726,9 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
         }
       }, !filenames.length);
     } catch (error) {
-      let ref1;
-      if (ref1 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
-        const match = ref1;
+      let ref4;
+      if (ref4 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
+        const match = ref4;
         return process.exitCode = Math.min(255, errors + +match[1]);
       } else {
         process.exitCode = 1;