@danielx/civet 0.10.3 → 0.10.5

package/dist/main.mjs

@@ -485,7 +485,7 @@ ${body}`;
 // source/parser.hera
 var import_lib2 = __toESM(require_machine());
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\util.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\traversal.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/comptime.civet.jsx
 import { resolve, dirname } from "node:path";
 import { createRequire } from "node:module";
 import vm from "node:vm";
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\helper.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/helper.civet.jsx
 var preludeVar = "var ";
 function ts(children) {
   return {
@@ -2357,7 +2359,7 @@ function extractPreludeFor(node) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\generate.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\comptime.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\function.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\block.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\op.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/op.civet.jsx
 var precedenceOrder = [
   ["||", "??"],
   ["^^"],
@@ -4778,7 +4780,7 @@ function expandChainedComparisons([first, binops]) {
   }
 }
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\pattern-matching.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\declaration.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\unary.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\pipe.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\auto-dec.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\string.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\parser\lib.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/parser/lib.civet.jsx
 var xor = (a, b) => a ? !b && a : b;
 function addPostfixStatement(statement, ws, post) {
   const expressions = [
@@ -8990,6 +8992,7 @@ var grammar = {
   AccessModifier,
   FieldDefinition,
   ThisLiteral,
+  BasicThisLiteral,
   HashThis,
   LengthShorthand,
   AtThis,
@@ -11355,23 +11358,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) {
@@ -11520,11 +11530,8 @@ var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2
 function FieldDefinition(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "FieldDefinition", FieldDefinition$$);
 }
-var ThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
-  return { "type": "Identifier", "name": "this", "children": [value[0]] };
-});
-var ThisLiteral$1 = HashThis;
-var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+var ThisLiteral$0 = HashThis;
+var ThisLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
   var at = $1;
   var id = $2;
   return {
@@ -11543,11 +11550,19 @@ var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_
     thisShorthand: true
   };
 });
-var ThisLiteral$3 = AtThis;
-var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2, ThisLiteral$3];
+var ThisLiteral$2 = BasicThisLiteral;
+var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2];
 function ThisLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ThisLiteral", ThisLiteral$$);
 }
+var BasicThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
+  return { "type": "Identifier", "name": "this", "children": [value[0]] };
+});
+var BasicThisLiteral$1 = AtThis;
+var BasicThisLiteral$$ = [BasicThisLiteral$0, BasicThisLiteral$1];
+function BasicThisLiteral(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "BasicThisLiteral", BasicThisLiteral$$);
+}
 var HashThis$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(AtThis), LengthShorthand, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$Y)((0, import_lib2.$S)(_, (0, import_lib2.$E)((0, import_lib2.$S)(Not, __)), ActualIn)), (0, import_lib2.$EXPECT)($L0, 'HashThis ""')))), function($skip, $loc, $0, $1, $2, $3) {
   var at = $1;
   var id = $2;
@@ -11584,7 +11599,7 @@ var HashThis$$ = [HashThis$0, HashThis$1, HashThis$2];
 function HashThis(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "HashThis", HashThis$$);
 }
-var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeCommentEnabled), Hash, NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   const id = "length";
   return {
     type: "Identifier",
@@ -12337,7 +12352,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 +12368,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 +12376,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 +12384,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 +12392,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$$);
 }
@@ -19868,7 +19891,14 @@ var TypeIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.
     args
   };
 });
-var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1];
+var TypeIdentifier$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), BasicThisLiteral), function($skip, $loc, $0, $1, $2) {
+  return {
+    type: "TypeIdentifier",
+    children: $0,
+    raw: $2.name
+  };
+});
+var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1, TypeIdentifier$2];
 function TypeIdentifier(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIdentifier", TypeIdentifier$$);
 }
@@ -21149,7 +21179,7 @@ var wellKnownSymbols = [
   "unscopables"
 ];
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\sourcemap.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/sourcemap.civet.jsx
 var sourcemap_civet_exports = {};
 __export(sourcemap_civet_exports, {
   SourceMap: () => SourceMap,
@@ -21463,7 +21493,7 @@ var remapPosition = function(position, sourcemapLines) {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\state-cache.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/state-cache.civet.jsx
 var StateCache = class {
   cache = /* @__PURE__ */ new Map();
   get(key) {
@@ -21503,7 +21533,7 @@ var StateCache = class {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\worker-pool.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/worker-pool.civet.jsx
 var WorkerPool = class {
   idle;
   spawned;
@@ -21605,7 +21635,7 @@ var WorkerPool = class {
   }
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\main.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\node-worker.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
+// unplugin-civet:/home/daniel/apps/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:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/astro.civet.jsx
 import civetUnplugin, {} from "./unplugin.mjs";
 var astro_civet_default = function(opts = {}) {
   return {

package/dist/unplugin/esbuild.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:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/esbuild.civet.jsx
 var esbuild_civet_exports = {};
 __export(esbuild_civet_exports, {
   default: () => esbuild_civet_default

package/dist/unplugin/esbuild.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/esbuild.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var esbuild_civet_default = civetUnplugin.esbuild;
 export {

package/dist/unplugin/farm.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:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/farm.civet.jsx
 var farm_civet_exports = {};
 __export(farm_civet_exports, {
   default: () => farm_civet_default

package/dist/unplugin/farm.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/farm.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var farm_civet_default = civetUnplugin.farm;
 export {

package/dist/unplugin/rolldown.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:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rolldown.civet.jsx
 var rolldown_civet_exports = {};
 __export(rolldown_civet_exports, {
   default: () => rolldown_civet_default

package/dist/unplugin/rolldown.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rolldown.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rolldown_civet_default = civetUnplugin.rolldown;
 export {

package/dist/unplugin/rollup.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:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rollup.civet.jsx
 var rollup_civet_exports = {};
 __export(rollup_civet_exports, {
   default: () => rollup_civet_default

package/dist/unplugin/rollup.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rollup.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rollup_civet_default = civetUnplugin.rollup;
 export {

package/dist/unplugin/rspack.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:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rspack.civet.jsx
 var rspack_civet_exports = {};
 __export(rspack_civet_exports, {
   default: () => rspack_civet_default

package/dist/unplugin/rspack.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rspack.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rspack_civet_default = civetUnplugin.rspack;
 export {

package/dist/unplugin/unplugin.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:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
 var unplugin_civet_exports = {};
 __export(unplugin_civet_exports, {
   default: () => unplugin_civet_default,
@@ -46,24 +46,26 @@ var import_os = __toESM(require("os"));
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
 DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
 DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
-var civetExtension = /\.civet$/;
-var isCivetTranspiled = /(\.civet)(\.[jt]sx)?([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
-function cleanCivetId(id) {
+var civetSuffix = ".civet";
+function extractCivetFilename(id, outputExtension) {
   let postfix = "";
-  id = id.replace(postfixRE, (match) => {
+  let filename = id.replace(postfixRE, (match) => {
     postfix = match;
     return "";
-  }).replace(/\.[jt]sx$/, "");
-  return { id, postfix };
+  });
+  if (filename.endsWith(outputExtension)) {
+    filename = filename.slice(0, -outputExtension.length);
+  }
+  return { filename, postfix };
 }
 function tryStatSync(file) {
   try {
@@ -359,10 +361,8 @@ var rawPlugin = (options = {}, meta) => {
                   } else {
                     console.log(`WARNING: No .d.ts extension in ${filePath}`);
                   }
-                  let ref1;
-                  if (ref1 = filePath.match(civetExtension)) {
-                    const match = ref1;
-                    filePath = filePath.slice(0, -match[0].length);
+                  if (filePath.endsWith(civetSuffix)) {
+                    filePath = filePath.slice(0, -civetSuffix.length);
                   } else {
                     console.log(`WARNING: No .civet extension in ${filePath}`);
                   }
@@ -395,38 +395,36 @@ var rawPlugin = (options = {}, meta) => {
         id = aliasResolver(id);
       }
       if (/\0/.test(id)) return null;
-      let postfix;
-      ({ id, postfix } = cleanCivetId(id));
-      let ref2;
-      if (import_path.default.isAbsolute(id)) {
-        ref2 = resolveAbsolutePath(rootDir, id, implicitExtension);
+      const { filename, postfix } = extractCivetFilename(id, outExt);
+      let ref1;
+      if (import_path.default.isAbsolute(filename)) {
+        ref1 = resolveAbsolutePath(rootDir, filename, implicitExtension);
       } else {
-        ref2 = import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+        ref1 = import_path.default.resolve(import_path.default.dirname(importer ?? ""), filename);
       }
       ;
-      let resolvedId = ref2;
-      if (!resolvedId) return null;
-      if (!resolvedId.endsWith(".civet")) {
+      let resolved = ref1;
+      if (!resolved) return null;
+      if (!resolved.endsWith(civetSuffix)) {
         if (!implicitExtension) return null;
-        const implicitId = implicitCivet(resolvedId);
+        const implicitId = implicitCivet(resolved);
         if (!implicitId) return null;
-        resolvedId = implicitId;
+        resolved = implicitId;
       }
       if (options2.scan && meta.framework === "vite") {
-        resolvedId = `\0${resolvedId}`;
+        resolved = `\0${resolved}`;
       }
-      return resolvedId + outExt + postfix;
+      return resolved + outExt + postfix;
     },
     loadInclude(id) {
-      return isCivetTranspiled.test(id);
+      return extractCivetFilename(id, outExt).filename.endsWith(civetSuffix);
     },
     async load(id) {
-      const match = isCivetTranspiled.exec(id);
-      if (!match) {
+      let { filename } = extractCivetFilename(id, outExt);
+      if (!filename.endsWith(civetSuffix)) {
         return null;
       }
-      const basename = id.slice(0, match.index + match[1].length);
-      const filename = import_path.default.resolve(rootDir, basename);
+      filename = import_path.default.resolve(rootDir, filename);
       this.addWatchFile(filename);
       let mtime, cached, resolve;
       if (cache != null) {
@@ -440,9 +438,9 @@ var rawPlugin = (options = {}, meta) => {
             if (cached.promise) {
               await cached.promise;
             }
-            let ref3;
-            if ((ref3 = cached.result) != null) {
-              const result = ref3;
+            let ref2;
+            if ((ref2 = cached.result) != null) {
+              const result = ref2;
               return result;
             }
           }
@@ -518,8 +516,8 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         if (transformTS) {
-          for (let ref4 = import_civet.lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref4.length; i < len; i++) {
-            const _spec = ref4[i];
+          for (let ref3 = import_civet.lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref3.length; i < len; i++) {
+            const _spec = ref3[i];
             const spec = _spec;
             if (spec.module?.input) {
               spec.module.token = spec.module.input.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
@@ -622,9 +620,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref5;
-        for (const key in ref5 = compiler.options.resolve.alias) {
-          const value = ref5[key];
+        let ref4;
+        for (const key in ref4 = compiler.options.resolve.alias) {
+          const value = ref4[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";