@danielx/civet 0.6.56 → 0.6.58

package/dist/browser.js

@@ -1131,12 +1131,12 @@ ${input.slice(result.pos)}
         }
         return node;
       }
-      function wrapIterationReturningResults(statement, outerRef) {
+      function wrapIterationReturningResults(statement, outer, outerRef) {
         if (statement.type === "DoStatement") {
           if (outerRef) {
             insertPush(statement.block, outerRef);
           } else {
-            insertReturn(statement.block);
+            insertReturn(statement.block, outer);
           }
           return;
         }
@@ -1146,7 +1146,7 @@ ${input.slice(result.pos)}
           children: ["const ", resultsRef, "=[];"]
         };
         insertPush(statement.block, resultsRef);
-        statement.children.unshift(declaration);
+        outer.children.unshift(declaration);
         if (outerRef) {
           statement.children.push(";", outerRef, ".push(", resultsRef, ");");
         } else {
@@ -1180,10 +1180,17 @@ ${input.slice(result.pos)}
         }
         if (!Array.isArray(node))
           return;
-        const [, exp] = node;
-        if (!exp)
+        let [, exp] = node;
+        if (!exp) {
           return;
+        }
         const indent = getIndent(node);
+        const outer = exp;
+        let { type } = exp;
+        if (type === "LabelledStatement") {
+          exp = exp.statement;
+          ({ type } = exp);
+        }
         switch (exp.type) {
           case "BreakStatement":
           case "ContinueStatement":
@@ -1204,7 +1211,7 @@ ${input.slice(result.pos)}
           case "ForStatement":
           case "IterationStatement":
           case "DoStatement":
-            wrapIterationReturningResults(exp, ref);
+            wrapIterationReturningResults(exp, outer, ref);
             return;
           case "BlockStatement":
             insertPush(exp.expressions[exp.expressions.length - 1], ref);
@@ -1573,7 +1580,7 @@ ${input.slice(result.pos)}
             return pattern;
         }
       }
-      function insertReturn(node) {
+      function insertReturn(node, outerNode = node) {
         if (!node)
           return;
         switch (node.type) {
@@ -1601,12 +1608,20 @@ ${input.slice(result.pos)}
         }
         if (!Array.isArray(node))
           return;
-        const [, exp, semi] = node;
-        if (semi?.type === "SemicolonDelimiter")
+        let [, exp, semi] = node;
+        if (semi?.type === "SemicolonDelimiter") {
           return;
-        if (!exp)
+        }
+        if (!exp) {
           return;
-        switch (exp.type) {
+        }
+        const outer = exp;
+        let { type } = exp;
+        if (type === "LabelledStatement") {
+          exp = exp.statement;
+          ({ type } = exp);
+        }
+        switch (type) {
           case "BreakStatement":
           case "ContinueStatement":
           case "DebuggerStatement":
@@ -1637,7 +1652,7 @@ ${input.slice(result.pos)}
           case "ForStatement":
           case "IterationStatement":
           case "DoStatement":
-            wrapIterationReturningResults(exp);
+            wrapIterationReturningResults(exp, outer);
             return;
           case "BlockStatement":
             insertReturn(exp.expressions[exp.expressions.length - 1]);
@@ -1690,6 +1705,9 @@ ${input.slice(result.pos)}
       function isPromiseVoidType(t) {
         return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
       }
+      function isGeneratorVoidType(t) {
+        return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+      }
       function isWhitespaceOrEmpty(node) {
         if (!node)
           return true;
@@ -2477,10 +2495,10 @@ ${input.slice(result.pos)}
         if (!processReturnValue(f) && implicitReturns) {
           const { signature, block } = f;
           const { modifier, name, returnType } = signature;
-          const { async, set } = modifier;
+          const { async, generator, set } = modifier;
           const isMethod = f.type === "MethodDefinition";
           const isConstructor = isMethod && name === "constructor";
-          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+          const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t) || !async && generator && isGeneratorVoidType(returnType?.t);
           const isBlock = block?.type === "BlockStatement";
           if (!isVoid && !set && !isConstructor && isBlock) {
             insertReturn(block);
@@ -6845,7 +6863,12 @@ ${input.slice(result.pos)}
         return {
           ...fn,
           id,
-          children: [...fn.children.slice(0, 2), insertTrimmingSpace(ws, " "), id, ...fn.children.slice(2)]
+          children: [
+            ...fn.children.slice(0, 3),
+            insertTrimmingSpace(ws, " "),
+            id,
+            ...fn.children.slice(3)
+          ]
         };
       });
       var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3];
@@ -8100,7 +8123,7 @@ ${input.slice(result.pos)}
         var block = $3;
         let children = $0;
         let generatorPos = 0;
-        const { modifier } = signature;
+        let { modifier } = signature;
         if (hasAwait(block)) {
           generatorPos++;
           children = children.slice();
@@ -8112,6 +8135,8 @@ ${input.slice(result.pos)}
           } else if (modifier?.async) {
           } else {
             children.unshift("async ");
+            modifier = { ...modifier, async: true };
+            signature = { ...signature, modifier };
           }
         }
         if (hasYield(block)) {
@@ -8125,6 +8150,8 @@ ${input.slice(result.pos)}
           } else if (modifier?.generator) {
           } else {
             children.splice(generatorPos, 0, "*");
+            modifier = { ...modifier, generator: true };
+            signature = { ...signature, modifier };
           }
         }
         return {
@@ -8226,7 +8253,7 @@ ${input.slice(result.pos)}
           async: true,
           get: false,
           set: false,
-          generator: !!$1,
+          generator: !!$2,
           children: $0
         };
       });
@@ -8853,7 +8880,16 @@ ${input.slice(result.pos)}
       function BlockStatement(ctx, state) {
         return $EVENT(ctx, state, "BlockStatement", BlockStatement$0);
       }
-      var LabelledStatement$0 = $S(Label, LabelledItem);
+      var LabelledStatement$0 = $TS($S(Label, LabelledItem), function($skip, $loc, $0, $1, $2) {
+        var label = $1;
+        var statement = $2;
+        return {
+          type: "LabelledStatement",
+          label,
+          statement,
+          children: $0
+        };
+      });
       function LabelledStatement(ctx, state) {
         return $EVENT(ctx, state, "LabelledStatement", LabelledStatement$0);
       }

package/dist/esbuild.js

@@ -42,7 +42,6 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivet = (id) => /\.civet([?#].*)?$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
@@ -69,11 +68,17 @@ function tryFsResolve(file) {
     return normalizePath(file);
   return void 0;
 }
-function resolveAbsolutePath(rootDir, id) {
-  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
-  if (!resolved)
-    return tryFsResolve(id);
-  return resolved;
+function resolveAbsolutePath(rootDir, id, implicitExtension) {
+  const file = import_path.default.join(rootDir, id);
+  return tryFsResolve(file) || implicitExtension && implicitCivet(file) || tryFsResolve(id) || implicitExtension && implicitCivet(id);
+}
+function implicitCivet(file) {
+  if (tryFsResolve(file))
+    return;
+  const civet2 = file + ".civet";
+  if (tryFsResolve(civet2))
+    return civet2;
+  return;
 }
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts)
@@ -82,6 +87,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     options.ts = "civet";
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
+  const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
@@ -196,13 +202,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     resolveId(id, importer) {
       if (/\0/.test(id))
         return null;
-      if (!isCivet(id) && !isCivetTranspiled(id))
-        return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
       if (!absolutePath)
         return null;
-      const relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      if (!relativeId.endsWith(".civet")) {
+        if (!implicitExtension)
+          return null;
+        const implicitId = implicitCivet(relativeId);
+        if (!implicitId)
+          return null;
+        relativeId = implicitId;
+      }
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -294,7 +306,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     },
     vite: {
       config(config) {
+        var _a;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        if (implicitExtension) {
+          config.resolve ?? (config.resolve = {});
+          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          config.resolve.extensions.push(".civet");
+        }
       },
       async transformIndexHtml(html) {
         return html.replace(
@@ -313,6 +331,17 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
             )
           )
         );
+      },
+      handleHotUpdate({ file, server, modules }) {
+        if (!file.endsWith(".civet"))
+          return;
+        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(relativeId);
+        if (module2) {
+          server.moduleGraph.onFileChange(relativeId);
+          return [...modules, module2];
+        }
+        return modules;
       }
     }
   };

package/dist/main.js

@@ -1123,12 +1123,12 @@ var require_lib = __commonJS({
       }
       return node;
     }
-    function wrapIterationReturningResults(statement, outerRef) {
+    function wrapIterationReturningResults(statement, outer, outerRef) {
       if (statement.type === "DoStatement") {
         if (outerRef) {
           insertPush(statement.block, outerRef);
         } else {
-          insertReturn(statement.block);
+          insertReturn(statement.block, outer);
         }
         return;
       }
@@ -1138,7 +1138,7 @@ var require_lib = __commonJS({
         children: ["const ", resultsRef, "=[];"]
       };
       insertPush(statement.block, resultsRef);
-      statement.children.unshift(declaration);
+      outer.children.unshift(declaration);
       if (outerRef) {
         statement.children.push(";", outerRef, ".push(", resultsRef, ");");
       } else {
@@ -1172,10 +1172,17 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp] = node;
-      if (!exp)
+      let [, exp] = node;
+      if (!exp) {
         return;
+      }
       const indent = getIndent(node);
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
       switch (exp.type) {
         case "BreakStatement":
         case "ContinueStatement":
@@ -1196,7 +1203,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp, ref);
+          wrapIterationReturningResults(exp, outer, ref);
           return;
         case "BlockStatement":
           insertPush(exp.expressions[exp.expressions.length - 1], ref);
@@ -1565,7 +1572,7 @@ var require_lib = __commonJS({
           return pattern;
       }
     }
-    function insertReturn(node) {
+    function insertReturn(node, outerNode = node) {
       if (!node)
         return;
       switch (node.type) {
@@ -1593,12 +1600,20 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp, semi] = node;
-      if (semi?.type === "SemicolonDelimiter")
+      let [, exp, semi] = node;
+      if (semi?.type === "SemicolonDelimiter") {
         return;
-      if (!exp)
+      }
+      if (!exp) {
         return;
-      switch (exp.type) {
+      }
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
+      switch (type) {
         case "BreakStatement":
         case "ContinueStatement":
         case "DebuggerStatement":
@@ -1629,7 +1644,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp);
+          wrapIterationReturningResults(exp, outer);
           return;
         case "BlockStatement":
           insertReturn(exp.expressions[exp.expressions.length - 1]);
@@ -1682,6 +1697,9 @@ var require_lib = __commonJS({
     function isPromiseVoidType(t) {
       return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
     }
+    function isGeneratorVoidType(t) {
+      return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+    }
     function isWhitespaceOrEmpty(node) {
       if (!node)
         return true;
@@ -2469,10 +2487,10 @@ var require_lib = __commonJS({
       if (!processReturnValue(f) && implicitReturns) {
         const { signature, block } = f;
         const { modifier, name, returnType } = signature;
-        const { async, set } = modifier;
+        const { async, generator, set } = modifier;
         const isMethod = f.type === "MethodDefinition";
         const isConstructor = isMethod && name === "constructor";
-        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t) || !async && generator && isGeneratorVoidType(returnType?.t);
         const isBlock = block?.type === "BlockStatement";
         if (!isVoid && !set && !isConstructor && isBlock) {
           insertReturn(block);
@@ -6837,7 +6855,12 @@ var require_parser = __commonJS({
       return {
         ...fn,
         id,
-        children: [...fn.children.slice(0, 2), insertTrimmingSpace(ws, " "), id, ...fn.children.slice(2)]
+        children: [
+          ...fn.children.slice(0, 3),
+          insertTrimmingSpace(ws, " "),
+          id,
+          ...fn.children.slice(3)
+        ]
       };
     });
     var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3];
@@ -8092,7 +8115,7 @@ var require_parser = __commonJS({
       var block = $3;
       let children = $0;
       let generatorPos = 0;
-      const { modifier } = signature;
+      let { modifier } = signature;
       if (hasAwait(block)) {
         generatorPos++;
         children = children.slice();
@@ -8104,6 +8127,8 @@ var require_parser = __commonJS({
         } else if (modifier?.async) {
         } else {
           children.unshift("async ");
+          modifier = { ...modifier, async: true };
+          signature = { ...signature, modifier };
         }
       }
       if (hasYield(block)) {
@@ -8117,6 +8142,8 @@ var require_parser = __commonJS({
         } else if (modifier?.generator) {
         } else {
           children.splice(generatorPos, 0, "*");
+          modifier = { ...modifier, generator: true };
+          signature = { ...signature, modifier };
         }
       }
       return {
@@ -8218,7 +8245,7 @@ var require_parser = __commonJS({
         async: true,
         get: false,
         set: false,
-        generator: !!$1,
+        generator: !!$2,
         children: $0
       };
     });
@@ -8845,7 +8872,16 @@ var require_parser = __commonJS({
     function BlockStatement(ctx, state) {
       return $EVENT(ctx, state, "BlockStatement", BlockStatement$0);
     }
-    var LabelledStatement$0 = $S(Label, LabelledItem);
+    var LabelledStatement$0 = $TS($S(Label, LabelledItem), function($skip, $loc, $0, $1, $2) {
+      var label = $1;
+      var statement = $2;
+      return {
+        type: "LabelledStatement",
+        label,
+        statement,
+        children: $0
+      };
+    });
     function LabelledStatement(ctx, state) {
       return $EVENT(ctx, state, "LabelledStatement", LabelledStatement$0);
     }

package/dist/main.mjs

@@ -1121,12 +1121,12 @@ var require_lib = __commonJS({
       }
       return node;
     }
-    function wrapIterationReturningResults(statement, outerRef) {
+    function wrapIterationReturningResults(statement, outer, outerRef) {
       if (statement.type === "DoStatement") {
         if (outerRef) {
           insertPush(statement.block, outerRef);
         } else {
-          insertReturn(statement.block);
+          insertReturn(statement.block, outer);
         }
         return;
       }
@@ -1136,7 +1136,7 @@ var require_lib = __commonJS({
         children: ["const ", resultsRef, "=[];"]
       };
       insertPush(statement.block, resultsRef);
-      statement.children.unshift(declaration);
+      outer.children.unshift(declaration);
       if (outerRef) {
         statement.children.push(";", outerRef, ".push(", resultsRef, ");");
       } else {
@@ -1170,10 +1170,17 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp] = node;
-      if (!exp)
+      let [, exp] = node;
+      if (!exp) {
         return;
+      }
       const indent = getIndent(node);
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
       switch (exp.type) {
         case "BreakStatement":
         case "ContinueStatement":
@@ -1194,7 +1201,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp, ref);
+          wrapIterationReturningResults(exp, outer, ref);
           return;
         case "BlockStatement":
           insertPush(exp.expressions[exp.expressions.length - 1], ref);
@@ -1563,7 +1570,7 @@ var require_lib = __commonJS({
           return pattern;
       }
     }
-    function insertReturn(node) {
+    function insertReturn(node, outerNode = node) {
       if (!node)
         return;
       switch (node.type) {
@@ -1591,12 +1598,20 @@ var require_lib = __commonJS({
       }
       if (!Array.isArray(node))
         return;
-      const [, exp, semi] = node;
-      if (semi?.type === "SemicolonDelimiter")
+      let [, exp, semi] = node;
+      if (semi?.type === "SemicolonDelimiter") {
         return;
-      if (!exp)
+      }
+      if (!exp) {
         return;
-      switch (exp.type) {
+      }
+      const outer = exp;
+      let { type } = exp;
+      if (type === "LabelledStatement") {
+        exp = exp.statement;
+        ({ type } = exp);
+      }
+      switch (type) {
         case "BreakStatement":
         case "ContinueStatement":
         case "DebuggerStatement":
@@ -1627,7 +1642,7 @@ var require_lib = __commonJS({
         case "ForStatement":
         case "IterationStatement":
         case "DoStatement":
-          wrapIterationReturningResults(exp);
+          wrapIterationReturningResults(exp, outer);
           return;
         case "BlockStatement":
           insertReturn(exp.expressions[exp.expressions.length - 1]);
@@ -1680,6 +1695,9 @@ var require_lib = __commonJS({
     function isPromiseVoidType(t) {
       return t?.type === "IdentifierType" && t.raw === "Promise" && t.args?.types?.length === 1 && isVoidType(t.args.types[0]);
     }
+    function isGeneratorVoidType(t) {
+      return t?.type === "IdentifierType" && (t.raw === "Iterator" || t.raw === "Generator") && t.args?.types?.length >= 2 && isVoidType(t.args.types[1]);
+    }
     function isWhitespaceOrEmpty(node) {
       if (!node)
         return true;
@@ -2467,10 +2485,10 @@ var require_lib = __commonJS({
       if (!processReturnValue(f) && implicitReturns) {
         const { signature, block } = f;
         const { modifier, name, returnType } = signature;
-        const { async, set } = modifier;
+        const { async, generator, set } = modifier;
         const isMethod = f.type === "MethodDefinition";
         const isConstructor = isMethod && name === "constructor";
-        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t);
+        const isVoid = isVoidType(returnType?.t) || async && isPromiseVoidType(returnType?.t) || !async && generator && isGeneratorVoidType(returnType?.t);
         const isBlock = block?.type === "BlockStatement";
         if (!isVoid && !set && !isConstructor && isBlock) {
           insertReturn(block);
@@ -6835,7 +6853,12 @@ var require_parser = __commonJS({
       return {
         ...fn,
         id,
-        children: [...fn.children.slice(0, 2), insertTrimmingSpace(ws, " "), id, ...fn.children.slice(2)]
+        children: [
+          ...fn.children.slice(0, 3),
+          insertTrimmingSpace(ws, " "),
+          id,
+          ...fn.children.slice(3)
+        ]
       };
     });
     var FunctionExpression$$ = [FunctionExpression$0, FunctionExpression$1, FunctionExpression$2, FunctionExpression$3];
@@ -8090,7 +8113,7 @@ var require_parser = __commonJS({
       var block = $3;
       let children = $0;
       let generatorPos = 0;
-      const { modifier } = signature;
+      let { modifier } = signature;
       if (hasAwait(block)) {
         generatorPos++;
         children = children.slice();
@@ -8102,6 +8125,8 @@ var require_parser = __commonJS({
         } else if (modifier?.async) {
         } else {
           children.unshift("async ");
+          modifier = { ...modifier, async: true };
+          signature = { ...signature, modifier };
         }
       }
       if (hasYield(block)) {
@@ -8115,6 +8140,8 @@ var require_parser = __commonJS({
         } else if (modifier?.generator) {
         } else {
           children.splice(generatorPos, 0, "*");
+          modifier = { ...modifier, generator: true };
+          signature = { ...signature, modifier };
         }
       }
       return {
@@ -8216,7 +8243,7 @@ var require_parser = __commonJS({
         async: true,
         get: false,
         set: false,
-        generator: !!$1,
+        generator: !!$2,
         children: $0
       };
     });
@@ -8843,7 +8870,16 @@ var require_parser = __commonJS({
     function BlockStatement(ctx, state) {
       return $EVENT(ctx, state, "BlockStatement", BlockStatement$0);
     }
-    var LabelledStatement$0 = $S(Label, LabelledItem);
+    var LabelledStatement$0 = $TS($S(Label, LabelledItem), function($skip, $loc, $0, $1, $2) {
+      var label = $1;
+      var statement = $2;
+      return {
+        type: "LabelledStatement",
+        label,
+        statement,
+        children: $0
+      };
+    });
     function LabelledStatement(ctx, state) {
       return $EVENT(ctx, state, "LabelledStatement", LabelledStatement$0);
     }

package/dist/rollup.js

@@ -42,7 +42,6 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivet = (id) => /\.civet([?#].*)?$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
@@ -69,11 +68,17 @@ function tryFsResolve(file) {
     return normalizePath(file);
   return void 0;
 }
-function resolveAbsolutePath(rootDir, id) {
-  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
-  if (!resolved)
-    return tryFsResolve(id);
-  return resolved;
+function resolveAbsolutePath(rootDir, id, implicitExtension) {
+  const file = import_path.default.join(rootDir, id);
+  return tryFsResolve(file) || implicitExtension && implicitCivet(file) || tryFsResolve(id) || implicitExtension && implicitCivet(id);
+}
+function implicitCivet(file) {
+  if (tryFsResolve(file))
+    return;
+  const civet2 = file + ".civet";
+  if (tryFsResolve(civet2))
+    return civet2;
+  return;
 }
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts)
@@ -82,6 +87,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     options.ts = "civet";
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
+  const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
@@ -196,13 +202,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     resolveId(id, importer) {
       if (/\0/.test(id))
         return null;
-      if (!isCivet(id) && !isCivetTranspiled(id))
-        return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
       if (!absolutePath)
         return null;
-      const relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      if (!relativeId.endsWith(".civet")) {
+        if (!implicitExtension)
+          return null;
+        const implicitId = implicitCivet(relativeId);
+        if (!implicitId)
+          return null;
+        relativeId = implicitId;
+      }
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -294,7 +306,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     },
     vite: {
       config(config) {
+        var _a;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        if (implicitExtension) {
+          config.resolve ?? (config.resolve = {});
+          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          config.resolve.extensions.push(".civet");
+        }
       },
       async transformIndexHtml(html) {
         return html.replace(
@@ -313,6 +331,17 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
             )
           )
         );
+      },
+      handleHotUpdate({ file, server, modules }) {
+        if (!file.endsWith(".civet"))
+          return;
+        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(relativeId);
+        if (module2) {
+          server.moduleGraph.onFileChange(relativeId);
+          return [...modules, module2];
+        }
+        return modules;
       }
     }
   };

package/dist/unplugin-shared.mjs

@@ -9,7 +9,6 @@ import * as fs from "fs";
 import path from "path";
 import * as tsvfs from "@typescript/vfs";
 import os from "os";
-var isCivet = (id) => /\.civet([?#].*)?$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
 var postfixRE = /[?#].*$/s;
 var isWindows = os.platform() === "win32";
@@ -36,11 +35,17 @@ function tryFsResolve(file) {
     return normalizePath(file);
   return void 0;
 }
-function resolveAbsolutePath(rootDir, id) {
-  const resolved = tryFsResolve(path.join(rootDir, id));
-  if (!resolved)
-    return tryFsResolve(id);
-  return resolved;
+function resolveAbsolutePath(rootDir, id, implicitExtension) {
+  const file = path.join(rootDir, id);
+  return tryFsResolve(file) || implicitExtension && implicitCivet(file) || tryFsResolve(id) || implicitExtension && implicitCivet(id);
+}
+function implicitCivet(file) {
+  if (tryFsResolve(file))
+    return;
+  const civet2 = file + ".civet";
+  if (tryFsResolve(civet2))
+    return civet2;
+  return;
 }
 var civetUnplugin = createUnplugin((options = {}) => {
   if (options.dts)
@@ -49,6 +54,7 @@ var civetUnplugin = createUnplugin((options = {}) => {
     options.ts = "civet";
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
+  const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
@@ -163,13 +169,19 @@ var civetUnplugin = createUnplugin((options = {}) => {
     resolveId(id, importer) {
       if (/\0/.test(id))
         return null;
-      if (!isCivet(id) && !isCivetTranspiled(id))
-        return null;
       id = cleanCivetId(id);
-      const absolutePath = path.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : path.resolve(path.dirname(importer ?? ""), id);
+      const absolutePath = path.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : path.resolve(path.dirname(importer ?? ""), id);
       if (!absolutePath)
         return null;
-      const relativeId = path.relative(process.cwd(), absolutePath);
+      let relativeId = path.relative(process.cwd(), absolutePath);
+      if (!relativeId.endsWith(".civet")) {
+        if (!implicitExtension)
+          return null;
+        const implicitId = implicitCivet(relativeId);
+        if (!implicitId)
+          return null;
+        relativeId = implicitId;
+      }
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -261,7 +273,13 @@ var civetUnplugin = createUnplugin((options = {}) => {
     },
     vite: {
       config(config) {
+        var _a;
         rootDir = path.resolve(process.cwd(), config.root ?? "");
+        if (implicitExtension) {
+          config.resolve ?? (config.resolve = {});
+          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          config.resolve.extensions.push(".civet");
+        }
       },
       async transformIndexHtml(html) {
         return html.replace(
@@ -280,6 +298,17 @@ var civetUnplugin = createUnplugin((options = {}) => {
             )
           )
         );
+      },
+      handleHotUpdate({ file, server, modules }) {
+        if (!file.endsWith(".civet"))
+          return;
+        const relativeId = slash(path.relative(process.cwd(), file) + outExt);
+        const module = server.moduleGraph.getModuleById(relativeId);
+        if (module) {
+          server.moduleGraph.onFileChange(relativeId);
+          return [...modules, module];
+        }
+        return modules;
       }
     }
   };

package/dist/unplugin.d.mts

@@ -2,6 +2,7 @@ import * as unplugin from 'unplugin';
 import { TransformResult } from 'unplugin';
 
 type PluginOptions = {
+    implicitExtension?: boolean;
     outputExtension?: string;
     transformOutput?: (code: string, id: string) => TransformResult | Promise<TransformResult>;
     emitDeclaration?: boolean;

package/dist/unplugin.d.ts

@@ -2,6 +2,7 @@ import * as unplugin from 'unplugin';
 import { TransformResult } from 'unplugin';
 
 type PluginOptions = {
+    implicitExtension?: boolean;
     outputExtension?: string;
     transformOutput?: (code: string, id: string) => TransformResult | Promise<TransformResult>;
     emitDeclaration?: boolean;

package/dist/unplugin.js

@@ -41,7 +41,6 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivet = (id) => /\.civet([?#].*)?$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
@@ -68,11 +67,17 @@ function tryFsResolve(file) {
     return normalizePath(file);
   return void 0;
 }
-function resolveAbsolutePath(rootDir, id) {
-  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
-  if (!resolved)
-    return tryFsResolve(id);
-  return resolved;
+function resolveAbsolutePath(rootDir, id, implicitExtension) {
+  const file = import_path.default.join(rootDir, id);
+  return tryFsResolve(file) || implicitExtension && implicitCivet(file) || tryFsResolve(id) || implicitExtension && implicitCivet(id);
+}
+function implicitCivet(file) {
+  if (tryFsResolve(file))
+    return;
+  const civet2 = file + ".civet";
+  if (tryFsResolve(civet2))
+    return civet2;
+  return;
 }
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts)
@@ -81,6 +86,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     options.ts = "civet";
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
+  const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
@@ -195,13 +201,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     resolveId(id, importer) {
       if (/\0/.test(id))
         return null;
-      if (!isCivet(id) && !isCivetTranspiled(id))
-        return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
       if (!absolutePath)
         return null;
-      const relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      if (!relativeId.endsWith(".civet")) {
+        if (!implicitExtension)
+          return null;
+        const implicitId = implicitCivet(relativeId);
+        if (!implicitId)
+          return null;
+        relativeId = implicitId;
+      }
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -293,7 +305,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     },
     vite: {
       config(config) {
+        var _a;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        if (implicitExtension) {
+          config.resolve ?? (config.resolve = {});
+          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          config.resolve.extensions.push(".civet");
+        }
       },
       async transformIndexHtml(html) {
         return html.replace(
@@ -312,6 +330,17 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
             )
           )
         );
+      },
+      handleHotUpdate({ file, server, modules }) {
+        if (!file.endsWith(".civet"))
+          return;
+        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(relativeId);
+        if (module2) {
+          server.moduleGraph.onFileChange(relativeId);
+          return [...modules, module2];
+        }
+        return modules;
       }
     }
   };

package/dist/vite.js

@@ -42,7 +42,6 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivet = (id) => /\.civet([?#].*)?$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
@@ -69,11 +68,17 @@ function tryFsResolve(file) {
     return normalizePath(file);
   return void 0;
 }
-function resolveAbsolutePath(rootDir, id) {
-  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
-  if (!resolved)
-    return tryFsResolve(id);
-  return resolved;
+function resolveAbsolutePath(rootDir, id, implicitExtension) {
+  const file = import_path.default.join(rootDir, id);
+  return tryFsResolve(file) || implicitExtension && implicitCivet(file) || tryFsResolve(id) || implicitExtension && implicitCivet(id);
+}
+function implicitCivet(file) {
+  if (tryFsResolve(file))
+    return;
+  const civet2 = file + ".civet";
+  if (tryFsResolve(civet2))
+    return civet2;
+  return;
 }
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts)
@@ -82,6 +87,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     options.ts = "civet";
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
+  const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
@@ -196,13 +202,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     resolveId(id, importer) {
       if (/\0/.test(id))
         return null;
-      if (!isCivet(id) && !isCivetTranspiled(id))
-        return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
       if (!absolutePath)
         return null;
-      const relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      if (!relativeId.endsWith(".civet")) {
+        if (!implicitExtension)
+          return null;
+        const implicitId = implicitCivet(relativeId);
+        if (!implicitId)
+          return null;
+        relativeId = implicitId;
+      }
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -294,7 +306,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     },
     vite: {
       config(config) {
+        var _a;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        if (implicitExtension) {
+          config.resolve ?? (config.resolve = {});
+          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          config.resolve.extensions.push(".civet");
+        }
       },
       async transformIndexHtml(html) {
         return html.replace(
@@ -313,6 +331,17 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
             )
           )
         );
+      },
+      handleHotUpdate({ file, server, modules }) {
+        if (!file.endsWith(".civet"))
+          return;
+        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(relativeId);
+        if (module2) {
+          server.moduleGraph.onFileChange(relativeId);
+          return [...modules, module2];
+        }
+        return modules;
       }
     }
   };

package/dist/webpack.js

@@ -42,7 +42,6 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivet = (id) => /\.civet([?#].*)?$/.test(id);
 var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
@@ -69,11 +68,17 @@ function tryFsResolve(file) {
     return normalizePath(file);
   return void 0;
 }
-function resolveAbsolutePath(rootDir, id) {
-  const resolved = tryFsResolve(import_path.default.join(rootDir, id));
-  if (!resolved)
-    return tryFsResolve(id);
-  return resolved;
+function resolveAbsolutePath(rootDir, id, implicitExtension) {
+  const file = import_path.default.join(rootDir, id);
+  return tryFsResolve(file) || implicitExtension && implicitCivet(file) || tryFsResolve(id) || implicitExtension && implicitCivet(id);
+}
+function implicitCivet(file) {
+  if (tryFsResolve(file))
+    return;
+  const civet2 = file + ".civet";
+  if (tryFsResolve(civet2))
+    return civet2;
+  return;
 }
 var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
   if (options.dts)
@@ -82,6 +87,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     options.ts = "civet";
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
+  const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions;
@@ -196,13 +202,19 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     resolveId(id, importer) {
       if (/\0/.test(id))
         return null;
-      if (!isCivet(id) && !isCivetTranspiled(id))
-        return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
       if (!absolutePath)
         return null;
-      const relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
+      if (!relativeId.endsWith(".civet")) {
+        if (!implicitExtension)
+          return null;
+        const implicitId = implicitCivet(relativeId);
+        if (!implicitId)
+          return null;
+        relativeId = implicitId;
+      }
       const relativePath = relativeId + outExt;
       return relativePath;
     },
@@ -294,7 +306,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
     },
     vite: {
       config(config) {
+        var _a;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        if (implicitExtension) {
+          config.resolve ?? (config.resolve = {});
+          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          config.resolve.extensions.push(".civet");
+        }
       },
       async transformIndexHtml(html) {
         return html.replace(
@@ -313,6 +331,17 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}) => {
             )
           )
         );
+      },
+      handleHotUpdate({ file, server, modules }) {
+        if (!file.endsWith(".civet"))
+          return;
+        const relativeId = slash(import_path.default.relative(process.cwd(), file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(relativeId);
+        if (module2) {
+          server.moduleGraph.onFileChange(relativeId);
+          return [...modules, module2];
+        }
+        return modules;
       }
     }
   };

package/package.json

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