@danielx/civet 0.10.3 → 0.10.4

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.10.4 (2025-05-17, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.3...v0.10.4), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.4))
+* Fix implicit returns in IIFEs with "civet -implicitReturns" [[#1737](https://github.com/DanielXMoore/Civet/pull/1737)]
+* Typed pinned arguments such as `(^x: T) =>`; forbid implicit object literals in pinned patterns [[#1736](https://github.com/DanielXMoore/Civet/pull/1736)]
+* Fix `outputExtension` option in unplugin, enabling `.svelte.ts`/`.svelte.js` for Svelte Runes reactive compatibility [[#1733](https://github.com/DanielXMoore/Civet/pull/1733)]
+* Type-only class field declarations `declare field: T` [[#1741](https://github.com/DanielXMoore/Civet/pull/1741)]
+
 ## 0.10.3 (2025-04-28, [diff](https://github.com/DanielXMoore/Civet/compare/v0.10.2...v0.10.3), [commits](https://github.com/DanielXMoore/Civet/commits/v0.10.3))
 * Explicit changelog build script shell [[#1727](https://github.com/DanielXMoore/Civet/pull/1727)]
 * ESM loader supports civetconfig by default, and overriding configuration [[#1734](https://github.com/DanielXMoore/Civet/pull/1734)]

package/dist/browser.js

@@ -1164,6 +1164,8 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
       },
       parameters,
       returnType: void 0,
+      implicitReturn: !0,
+      // force implicit return in IIFE
       children: generator.length ? [async, "function", generator, parameters] : [async, parameters]
     }, fn;
     generator.length ? fn = makeNode({
@@ -2291,7 +2293,7 @@ ${js}`
   }
   function processReturn(f, implicitReturns) {
     let { returnType } = f.signature;
-    if (returnType && returnType.optional && convertOptionalType(returnType), !processReturnValue(f) && implicitReturns) {
+    if (returnType && returnType.optional && convertOptionalType(returnType), !processReturnValue(f) && (implicitReturns || f.signature.implicitReturn)) {
       let { signature, block } = f, { modifier, name, returnType: returnType2 } = signature, { async, generator, set } = modifier, isConstructor = f.type === "MethodDefinition" && name === "constructor", isVoid = generator || isVoidType(returnType2?.t) || async && isPromiseVoidType(returnType2?.t);
       block?.type === "BlockStatement" && (isVoid || set || isConstructor ? block.bare && block.implicitlyReturned && braceBlock(block) : block.implicitlyReturned || insertReturn(block));
     }
@@ -8346,17 +8348,20 @@ ${js}`
   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 decorators = $1, definition = $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, declare = $2, access = $3, static_ = $4, override = $5, definition = $6;
+    let ts2 = definition.ts || !!declare;
     return definition.type === "MultiMethodDefinition" ? {
       ...definition,
+      ts: ts2,
       children: definition.children.map((c) => ({
         ...c,
-        children: [decorators, ...c.children]
+        children: [decorators, declare, access, static_, override, ...c.children]
       }))
     } : {
       ...definition,
-      children: [decorators, $2, $3, $4, ...definition.children]
+      ts: ts2,
+      children: [decorators, declare, access, static_, override, ...definition.children]
     };
   }), ClassElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
     return {
@@ -9088,35 +9093,42 @@ ${js}`
   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
     };
-  }), PinPattern$1 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip, $loc, $0, $1) {
+  }), PinPattern$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Caret, SingleLineExpressionWithIndentedApplicationForbidden), function($skip, $loc, $0, $1, $2) {
+    var expression = $2;
+    return {
+      type: "PinPattern",
+      children: [expression],
+      expression
+    };
+  }), PinPattern$2 = (0, import_lib2.$TV)(ActualMemberExpression, function($skip, $loc, $0, $1) {
     var expression = $0;
     return {
       type: "PinPattern",
       children: [expression],
       expression
     };
-  }), PinPattern$2 = (0, import_lib2.$TV)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R14, "PinPattern /[+-]/"), NumericLiteral), function($skip, $loc, $0, $1) {
+  }), 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",
       children: [expression],
       expression
     };
-  }), PinPattern$3 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1) {
+  }), PinPattern$4 = (0, import_lib2.$TV)(Undefined, function($skip, $loc, $0, $1) {
     var expression = $0;
     return {
       type: "PinPattern",
       children: [expression],
       expression
     };
-  }), PinPattern$$ = [PinPattern$0, PinPattern$1, PinPattern$2, PinPattern$3];
+  }), 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$$);
   }

package/dist/main.js

@@ -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;
@@ -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;
@@ -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$$);
 }

package/dist/main.mjs

@@ -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;
@@ -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;
@@ -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$$);
 }

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/unplugin.js

@@ -52,18 +52,20 @@ 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";

package/dist/unplugin/unplugin.mjs

@@ -20,18 +20,20 @@ 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 = os.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 {
@@ -327,10 +329,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}`);
                   }
@@ -363,38 +363,36 @@ var rawPlugin = (options = {}, meta) => {
         id = aliasResolver(id);
       }
       if (/\0/.test(id)) return null;
-      let postfix;
-      ({ id, postfix } = cleanCivetId(id));
-      let ref2;
-      if (path.isAbsolute(id)) {
-        ref2 = resolveAbsolutePath(rootDir, id, implicitExtension);
+      const { filename, postfix } = extractCivetFilename(id, outExt);
+      let ref1;
+      if (path.isAbsolute(filename)) {
+        ref1 = resolveAbsolutePath(rootDir, filename, implicitExtension);
       } else {
-        ref2 = path.resolve(path.dirname(importer ?? ""), id);
+        ref1 = path.resolve(path.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 = path.resolve(rootDir, basename);
+      filename = path.resolve(rootDir, filename);
       this.addWatchFile(filename);
       let mtime, cached, resolve;
       if (cache != null) {
@@ -408,9 +406,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;
             }
           }
@@ -486,8 +484,8 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         if (transformTS) {
-          for (let ref4 = lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref4.length; i < len; i++) {
-            const _spec = ref4[i];
+          for (let ref3 = 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");
@@ -590,9 +588,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";

package/package.json

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