@danielx/civet 0.10.2 → 0.10.4

package/dist/main.js

@@ -483,7 +483,7 @@ ${body}`;
   }
 });
 
-// unplugin-civet:/home/daniel/apps/Civet/source/main.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
 var main_civet_exports = {};
 __export(main_civet_exports, {
   ParseError: () => import_lib2.ParseError,
@@ -504,7 +504,7 @@ module.exports = __toCommonJS(main_civet_exports);
 // source/parser.hera
 var import_lib2 = __toESM(require_machine());
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
 var lib_civet_exports = {};
 __export(lib_civet_exports, {
   addPostfixStatement: () => addPostfixStatement,
@@ -584,7 +584,7 @@ __export(lib_civet_exports, {
   wrapTypeInPromise: () => wrapTypeInPromise
 });
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/util.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\util.civet.jsx
 function len(arr, length) {
   return arr.length === length;
 }
@@ -1488,6 +1488,8 @@ function wrapIIFE(expressions, asyncFlag, generatorStar) {
     },
     parameters,
     returnType: void 0,
+    implicitReturn: true,
+    // force implicit return in IIFE
     children: generator.length ? [async, "function", generator, parameters] : [async, parameters]
   };
   let fn;
@@ -1583,7 +1585,7 @@ function flatJoin(array, separator) {
   return result;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/traversal.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\traversal.civet.jsx
 function gatherRecursiveWithinFunction(node, predicate) {
   return gatherRecursive(node, predicate, isFunction);
 }
@@ -1692,7 +1694,7 @@ function gatherRecursiveAll(node, predicate) {
   return nodes;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/ref.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
 var range = (start, end) => {
   const length = end - start;
   if (length <= 0) return [];
@@ -1787,7 +1789,7 @@ function populateRefs(statements) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/binding.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
 function adjustAtBindings(statements, asThis = false) {
   for (let ref1 = gatherRecursiveAll(statements, ($1) => $1.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
     const binding = ref1[i1];
@@ -2054,12 +2056,12 @@ function gatherBindingPatternTypeSuffix(pattern) {
   return pattern;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
 var import_node_path = require("node:path");
 var import_node_module = require("node:module");
 var import_node_vm = __toESM(require("node:vm"));
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/helper.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\helper.civet.jsx
 var preludeVar = "var ";
 function ts(children) {
   return {
@@ -2376,7 +2378,7 @@ function extractPreludeFor(node) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/generate.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\generate.civet.jsx
 function stringify(node) {
   try {
     return JSON.stringify(removeParentPointers(node));
@@ -2486,7 +2488,7 @@ function prune(node) {
   return node;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
 function expressionizeComptime(statement) {
   const { expressions } = statement.block;
   const expression = wrapIIFE(expressions, hasAwait(expressions));
@@ -2807,7 +2809,7 @@ function serialize(value, context) {
   return recurse(value);
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/function.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\function.civet.jsx
 var concatAssign = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function getTypeArguments(args) {
   while (typeof args === "object" && args != null && "args" in args) {
@@ -2895,7 +2897,7 @@ function processReturn(f, implicitReturns) {
   if (returnType && returnType.optional) {
     convertOptionalType(returnType);
   }
-  if (!processReturnValue(f) && implicitReturns) {
+  if (!processReturnValue(f) && (implicitReturns || f.signature.implicitReturn)) {
     const { signature, block } = f;
     const { modifier, name, returnType: returnType2 } = signature;
     const { async, generator, set } = modifier;
@@ -4240,7 +4242,7 @@ function makeAmpersandFunction(rhs) {
   return fn;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/block.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\block.civet.jsx
 function blockWithPrefix(prefixStatements, block) {
   if (prefixStatements && prefixStatements.length) {
     const expressions = [...prefixStatements, ...block.expressions];
@@ -4461,7 +4463,7 @@ function blockContainingStatement(exp) {
   };
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/op.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\op.civet.jsx
 var precedenceOrder = [
   ["||", "??"],
   ["^^"],
@@ -4797,7 +4799,7 @@ function expandChainedComparisons([first, binops]) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/pattern-matching.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pattern-matching.civet.jsx
 function processPatternTest(lhs, patterns) {
   const { ref, refAssignmentComma } = maybeRefAssignment(lhs, "m");
   const conditionExpression = flatJoin(patterns.map(($1) => getPatternConditions($1, ref)).map(($2) => flatJoin($2, " && ")), " || ");
@@ -5316,7 +5318,7 @@ function aliasBinding(p, ref) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/declaration.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\declaration.civet.jsx
 function len2(arr, length) {
   return arr.length === length;
 }
@@ -5870,7 +5872,7 @@ function convertWithClause(withClause, extendsClause) {
   return [extendsToken, insertTrimmingSpace(ws, " "), wrapped];
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/unary.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\unary.civet.jsx
 function processUnaryExpression(pre, exp, post) {
   if (!(pre.length || post)) {
     return exp;
@@ -6032,7 +6034,7 @@ function processUnaryNestedExpression(pre, args, post) {
   return processUnaryExpression(pre, args, post);
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/pipe.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pipe.civet.jsx
 function constructInvocation(fn, arg) {
   let expr = fn.expr;
   while (expr.type === "ParenthesizedExpression") {
@@ -6255,7 +6257,7 @@ function processPipelineExpressions(statements) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/for.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
 function processRangeExpression(start, ws1, range2, end) {
   ws1 = [ws1, range2.children[0]];
   const ws2 = range2.children[1];
@@ -6700,7 +6702,7 @@ function processForInOf($0) {
   };
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/auto-dec.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\auto-dec.civet.jsx
 var concatAssign2 = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function findDecs(statements) {
   const declarations = gatherNodes(statements, ($) => $.type === "Declaration");
@@ -6846,7 +6848,7 @@ function createVarDecs(block, scopes, pushVar) {
   scopes.pop();
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/string.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\string.civet.jsx
 function getIndentLevel(str, tab) {
   if (tab != null && tab != 1) {
     const tabs = str.match(/\t/g);
@@ -7014,7 +7016,7 @@ function quoteString(str) {
   return JSON.stringify(str);
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
 var xor = (a, b) => a ? !b && a : b;
 function addPostfixStatement(statement, ws, post) {
   const expressions = [
@@ -11374,23 +11376,30 @@ var NestedClassElement$0 = (0, import_lib2.$S)(Nested, ClassElement, StatementDe
 function NestedClassElement(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedClassElement", NestedClassElement$0);
 }
-var ClassElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(Decorators), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)((0, import_lib2.$S)(Static, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Override, (0, import_lib2.$E)(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var ClassElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(Decorators), (0, import_lib2.$E)((0, import_lib2.$S)(Declare, (0, import_lib2.$E)(_))), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)((0, import_lib2.$S)(Static, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Override, (0, import_lib2.$E)(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var decorators = $1;
-  var definition = $5;
+  var declare = $2;
+  var access = $3;
+  var static_ = $4;
+  var override = $5;
+  var definition = $6;
+  const ts2 = definition.ts || !!declare;
   if (definition.type === "MultiMethodDefinition") {
     return {
       ...definition,
+      ts: ts2,
       children: definition.children.map((c) => {
         return {
           ...c,
-          children: [decorators, ...c.children]
+          children: [decorators, declare, access, static_, override, ...c.children]
         };
       })
     };
   }
   return {
     ...definition,
-    children: [decorators, $2, $3, $4, ...definition.children]
+    ts: ts2,
+    children: [decorators, declare, access, static_, override, ...definition.children]
   };
 });
 var ClassElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
@@ -12356,7 +12365,15 @@ var AtIdentifierRef$$ = [AtIdentifierRef$0, AtIdentifierRef$1];
 function AtIdentifierRef(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "AtIdentifierRef", AtIdentifierRef$$);
 }
-var PinPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExpressionWithIndentedApplicationForbidden), function($skip, $loc, $0, $1, $2) {
+var PinPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, IdentifierName, (0, import_lib2.$Y)(Colon)), function($skip, $loc, $0, $1, $2, $3) {
+  var expression = $2;
+  return {
+    type: "PinPattern",
+    children: [expression],
+    expression
+  };
+});
+var PinPattern$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExpressionWithIndentedApplicationForbidden), function($skip, $loc, $0, $1, $2) {
   var expression = $2;
   return {
     type: "PinPattern",
@@ -12364,7 +12381,7 @@ var PinPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExp
     expression
   };
 });
-var PinPattern$1 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip, $loc, $0, $1) {
+var PinPattern$2 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip, $loc, $0, $1) {
   var expression = $0;
   return {
     type: "PinPattern",
@@ -12372,7 +12389,7 @@ var PinPattern$1 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip,
     expression
   };
 });
-var PinPattern$2 = (0, import_lib2.$TV)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R14, "PinPattern /[+-]/"), NumericLiteral), function($skip, $loc, $0, $1) {
+var PinPattern$3 = (0, import_lib2.$TV)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R14, "PinPattern /[+-]/"), NumericLiteral), function($skip, $loc, $0, $1) {
   var expression = $0;
   return {
     type: "PinPattern",
@@ -12380,7 +12397,7 @@ var PinPattern$2 = (0, import_lib2.$TV)((0, import_lib2.$S)((0, import_lib2.$EXP
     expression
   };
 });
-var PinPattern$3 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1) {
+var PinPattern$4 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1) {
   var expression = $0;
   return {
     type: "PinPattern",
@@ -12388,7 +12405,7 @@ var PinPattern$3 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1)
     expression
   };
 });
-var PinPattern$$ = [PinPattern$0, PinPattern$1, PinPattern$2, PinPattern$3];
+var PinPattern$$ = [PinPattern$0, PinPattern$1, PinPattern$2, PinPattern$3, PinPattern$4];
 function PinPattern(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PinPattern", PinPattern$$);
 }
@@ -21168,7 +21185,7 @@ var wellKnownSymbols = [
   "unscopables"
 ];
 
-// unplugin-civet:/home/daniel/apps/Civet/source/sourcemap.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\sourcemap.civet.jsx
 var sourcemap_civet_exports = {};
 __export(sourcemap_civet_exports, {
   SourceMap: () => SourceMap,
@@ -21482,7 +21499,7 @@ var remapPosition = function(position, sourcemapLines) {
   }
 };
 
-// unplugin-civet:/home/daniel/apps/Civet/source/state-cache.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\state-cache.civet.jsx
 var StateCache = class {
   cache = /* @__PURE__ */ new Map();
   get(key) {
@@ -21522,7 +21539,7 @@ var StateCache = class {
   }
 };
 
-// unplugin-civet:/home/daniel/apps/Civet/source/worker-pool.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\worker-pool.civet.jsx
 var WorkerPool = class {
   idle;
   spawned;
@@ -21618,7 +21635,7 @@ var WorkerPool = class {
   }
 };
 
-// unplugin-civet:/home/daniel/apps/Civet/source/main.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
 var { SourceMap: SourceMap2 } = sourcemap_civet_exports;
 var ParseErrors = class extends Error {
   name = "ParseErrors";

package/dist/main.mjs

@@ -485,7 +485,7 @@ ${body}`;
 // source/parser.hera
 var import_lib2 = __toESM(require_machine());
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
 var lib_civet_exports = {};
 __export(lib_civet_exports, {
   addPostfixStatement: () => addPostfixStatement,
@@ -565,7 +565,7 @@ __export(lib_civet_exports, {
   wrapTypeInPromise: () => wrapTypeInPromise
 });
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/util.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\util.civet.jsx
 function len(arr, length) {
   return arr.length === length;
 }
@@ -1469,6 +1469,8 @@ function wrapIIFE(expressions, asyncFlag, generatorStar) {
     },
     parameters,
     returnType: void 0,
+    implicitReturn: true,
+    // force implicit return in IIFE
     children: generator.length ? [async, "function", generator, parameters] : [async, parameters]
   };
   let fn;
@@ -1564,7 +1566,7 @@ function flatJoin(array, separator) {
   return result;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/traversal.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\traversal.civet.jsx
 function gatherRecursiveWithinFunction(node, predicate) {
   return gatherRecursive(node, predicate, isFunction);
 }
@@ -1673,7 +1675,7 @@ function gatherRecursiveAll(node, predicate) {
   return nodes;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/ref.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
 var range = (start, end) => {
   const length = end - start;
   if (length <= 0) return [];
@@ -1768,7 +1770,7 @@ function populateRefs(statements) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/binding.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
 function adjustAtBindings(statements, asThis = false) {
   for (let ref1 = gatherRecursiveAll(statements, ($1) => $1.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
     const binding = ref1[i1];
@@ -2035,12 +2037,12 @@ function gatherBindingPatternTypeSuffix(pattern) {
   return pattern;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
 import { resolve, dirname } from "node:path";
 import { createRequire } from "node:module";
 import vm from "node:vm";
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/helper.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\helper.civet.jsx
 var preludeVar = "var ";
 function ts(children) {
   return {
@@ -2357,7 +2359,7 @@ function extractPreludeFor(node) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/generate.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\generate.civet.jsx
 function stringify(node) {
   try {
     return JSON.stringify(removeParentPointers(node));
@@ -2467,7 +2469,7 @@ function prune(node) {
   return node;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
 function expressionizeComptime(statement) {
   const { expressions } = statement.block;
   const expression = wrapIIFE(expressions, hasAwait(expressions));
@@ -2788,7 +2790,7 @@ function serialize(value, context) {
   return recurse(value);
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/function.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\function.civet.jsx
 var concatAssign = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function getTypeArguments(args) {
   while (typeof args === "object" && args != null && "args" in args) {
@@ -2876,7 +2878,7 @@ function processReturn(f, implicitReturns) {
   if (returnType && returnType.optional) {
     convertOptionalType(returnType);
   }
-  if (!processReturnValue(f) && implicitReturns) {
+  if (!processReturnValue(f) && (implicitReturns || f.signature.implicitReturn)) {
     const { signature, block } = f;
     const { modifier, name, returnType: returnType2 } = signature;
     const { async, generator, set } = modifier;
@@ -4221,7 +4223,7 @@ function makeAmpersandFunction(rhs) {
   return fn;
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/block.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\block.civet.jsx
 function blockWithPrefix(prefixStatements, block) {
   if (prefixStatements && prefixStatements.length) {
     const expressions = [...prefixStatements, ...block.expressions];
@@ -4442,7 +4444,7 @@ function blockContainingStatement(exp) {
   };
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/op.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\op.civet.jsx
 var precedenceOrder = [
   ["||", "??"],
   ["^^"],
@@ -4778,7 +4780,7 @@ function expandChainedComparisons([first, binops]) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/pattern-matching.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pattern-matching.civet.jsx
 function processPatternTest(lhs, patterns) {
   const { ref, refAssignmentComma } = maybeRefAssignment(lhs, "m");
   const conditionExpression = flatJoin(patterns.map(($1) => getPatternConditions($1, ref)).map(($2) => flatJoin($2, " && ")), " || ");
@@ -5297,7 +5299,7 @@ function aliasBinding(p, ref) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/declaration.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\declaration.civet.jsx
 function len2(arr, length) {
   return arr.length === length;
 }
@@ -5851,7 +5853,7 @@ function convertWithClause(withClause, extendsClause) {
   return [extendsToken, insertTrimmingSpace(ws, " "), wrapped];
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/unary.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\unary.civet.jsx
 function processUnaryExpression(pre, exp, post) {
   if (!(pre.length || post)) {
     return exp;
@@ -6013,7 +6015,7 @@ function processUnaryNestedExpression(pre, args, post) {
   return processUnaryExpression(pre, args, post);
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/pipe.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pipe.civet.jsx
 function constructInvocation(fn, arg) {
   let expr = fn.expr;
   while (expr.type === "ParenthesizedExpression") {
@@ -6236,7 +6238,7 @@ function processPipelineExpressions(statements) {
   }
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/for.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
 function processRangeExpression(start, ws1, range2, end) {
   ws1 = [ws1, range2.children[0]];
   const ws2 = range2.children[1];
@@ -6681,7 +6683,7 @@ function processForInOf($0) {
   };
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/auto-dec.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\auto-dec.civet.jsx
 var concatAssign2 = (lhs, rhs) => (rhs?.[Symbol.isConcatSpreadable] ?? Array.isArray(rhs) ? lhs.push.apply(lhs, rhs) : lhs.push(rhs), lhs);
 function findDecs(statements) {
   const declarations = gatherNodes(statements, ($) => $.type === "Declaration");
@@ -6827,7 +6829,7 @@ function createVarDecs(block, scopes, pushVar) {
   scopes.pop();
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/string.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\string.civet.jsx
 function getIndentLevel(str, tab) {
   if (tab != null && tab != 1) {
     const tabs = str.match(/\t/g);
@@ -6995,7 +6997,7 @@ function quoteString(str) {
   return JSON.stringify(str);
 }
 
-// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
 var xor = (a, b) => a ? !b && a : b;
 function addPostfixStatement(statement, ws, post) {
   const expressions = [
@@ -11355,23 +11357,30 @@ var NestedClassElement$0 = (0, import_lib2.$S)(Nested, ClassElement, StatementDe
 function NestedClassElement(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedClassElement", NestedClassElement$0);
 }
-var ClassElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(Decorators), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)((0, import_lib2.$S)(Static, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Override, (0, import_lib2.$E)(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var ClassElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(Decorators), (0, import_lib2.$E)((0, import_lib2.$S)(Declare, (0, import_lib2.$E)(_))), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)((0, import_lib2.$S)(Static, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Override, (0, import_lib2.$E)(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var decorators = $1;
-  var definition = $5;
+  var declare = $2;
+  var access = $3;
+  var static_ = $4;
+  var override = $5;
+  var definition = $6;
+  const ts2 = definition.ts || !!declare;
   if (definition.type === "MultiMethodDefinition") {
     return {
       ...definition,
+      ts: ts2,
       children: definition.children.map((c) => {
         return {
           ...c,
-          children: [decorators, ...c.children]
+          children: [decorators, declare, access, static_, override, ...c.children]
         };
       })
     };
   }
   return {
     ...definition,
-    children: [decorators, $2, $3, $4, ...definition.children]
+    ts: ts2,
+    children: [decorators, declare, access, static_, override, ...definition.children]
   };
 });
 var ClassElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
@@ -12337,7 +12346,15 @@ var AtIdentifierRef$$ = [AtIdentifierRef$0, AtIdentifierRef$1];
 function AtIdentifierRef(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "AtIdentifierRef", AtIdentifierRef$$);
 }
-var PinPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExpressionWithIndentedApplicationForbidden), function($skip, $loc, $0, $1, $2) {
+var PinPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, IdentifierName, (0, import_lib2.$Y)(Colon)), function($skip, $loc, $0, $1, $2, $3) {
+  var expression = $2;
+  return {
+    type: "PinPattern",
+    children: [expression],
+    expression
+  };
+});
+var PinPattern$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExpressionWithIndentedApplicationForbidden), function($skip, $loc, $0, $1, $2) {
   var expression = $2;
   return {
     type: "PinPattern",
@@ -12345,7 +12362,7 @@ var PinPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExp
     expression
   };
 });
-var PinPattern$1 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip, $loc, $0, $1) {
+var PinPattern$2 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip, $loc, $0, $1) {
   var expression = $0;
   return {
     type: "PinPattern",
@@ -12353,7 +12370,7 @@ var PinPattern$1 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip,
     expression
   };
 });
-var PinPattern$2 = (0, import_lib2.$TV)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R14, "PinPattern /[+-]/"), NumericLiteral), function($skip, $loc, $0, $1) {
+var PinPattern$3 = (0, import_lib2.$TV)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R14, "PinPattern /[+-]/"), NumericLiteral), function($skip, $loc, $0, $1) {
   var expression = $0;
   return {
     type: "PinPattern",
@@ -12361,7 +12378,7 @@ var PinPattern$2 = (0, import_lib2.$TV)((0, import_lib2.$S)((0, import_lib2.$EXP
     expression
   };
 });
-var PinPattern$3 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1) {
+var PinPattern$4 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1) {
   var expression = $0;
   return {
     type: "PinPattern",
@@ -12369,7 +12386,7 @@ var PinPattern$3 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1)
     expression
   };
 });
-var PinPattern$$ = [PinPattern$0, PinPattern$1, PinPattern$2, PinPattern$3];
+var PinPattern$$ = [PinPattern$0, PinPattern$1, PinPattern$2, PinPattern$3, PinPattern$4];
 function PinPattern(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PinPattern", PinPattern$$);
 }
@@ -21149,7 +21166,7 @@ var wellKnownSymbols = [
   "unscopables"
 ];
 
-// unplugin-civet:/home/daniel/apps/Civet/source/sourcemap.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\sourcemap.civet.jsx
 var sourcemap_civet_exports = {};
 __export(sourcemap_civet_exports, {
   SourceMap: () => SourceMap,
@@ -21463,7 +21480,7 @@ var remapPosition = function(position, sourcemapLines) {
   }
 };
 
-// unplugin-civet:/home/daniel/apps/Civet/source/state-cache.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\state-cache.civet.jsx
 var StateCache = class {
   cache = /* @__PURE__ */ new Map();
   get(key) {
@@ -21503,7 +21520,7 @@ var StateCache = class {
   }
 };
 
-// unplugin-civet:/home/daniel/apps/Civet/source/worker-pool.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\worker-pool.civet.jsx
 var WorkerPool = class {
   idle;
   spawned;
@@ -21605,7 +21622,7 @@ var WorkerPool = class {
   }
 };
 
-// unplugin-civet:/home/daniel/apps/Civet/source/main.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
 var { SourceMap: SourceMap2 } = sourcemap_civet_exports;
 var ParseErrors = class extends Error {
   name = "ParseErrors";

package/dist/node-worker.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/node-worker.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\node-worker.civet.jsx
 import { parentPort } from "node:worker_threads";
 import module from "node:module";
 try {

package/dist/types.d.ts

@@ -1,8 +1,9 @@
 declare module "@danielx/civet" {
   export type CivetAST = unknown
   export type ParseOptions = Partial<{
-    autoVar: boolean
+    autoConst: boolean
     autoLet: boolean
+    autoVar: boolean
     coffeeBinaryExistential: boolean
     coffeeBooleans: boolean
     coffeeClasses: boolean

package/dist/unplugin/astro.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/astro.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
 var astro_civet_exports = {};
 __export(astro_civet_exports, {
   default: () => astro_civet_default

package/dist/unplugin/astro.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/astro.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
 import civetUnplugin, {} from "./unplugin.mjs";
 var astro_civet_default = function(opts = {}) {
   return {