@danielx/civet 0.6.78 → 0.6.80

package/dist/browser.js

@@ -2411,9 +2411,16 @@ var Civet = (() => {
     const { decl, bindings } = condition.declaration;
     const binding = bindings[0];
     const { pattern, suffix, initializer, splices, thisAssignments } = binding;
+    const grandparent = condition.parent?.parent;
+    const children = (
+      // Check that the declaration is a plain assignment (no pattern-matching) and the immediate grandchild of an `if` or `while`
+      // More complex conditions (triggered by pattern matching or `until`/`unless`) don't need double parens
+      // @ts-ignore Just because pattern might not have a type at runtime doesn't mean it's unsafe
+      pattern.type === "Identifier" && (grandparent?.type === "IfStatement" || grandparent?.type === "WhileStatement") ? ["(", ref, initializer, ")"] : [ref, initializer]
+    );
     Object.assign(condition, {
       type: "AssignmentExpression",
-      children: [ref, initializer],
+      children,
       hoistDec: {
         type: "Declaration",
         children: ["let ", ref, suffix],
@@ -2887,7 +2894,13 @@ var Civet = (() => {
     };
   }
   function modifyString(str) {
-    return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
+    return str.replace(/((?:\\.|[^\r\n])*)(\r\n|\n|\r)?/gsu, function(_, chars, nl) {
+      if (nl) {
+        return chars + "\\n";
+      } else {
+        return chars;
+      }
+    });
   }
   function quoteString(str) {
     str = str.replace(/\\/g, "\\\\");

package/dist/esbuild.js

@@ -42,7 +42,7 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
+var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
@@ -126,7 +126,8 @@ var rawPlugin = (options = {}, meta) => {
         );
         compilerOptions = {
           ...configContents.options,
-          target: ts.ScriptTarget.ESNext
+          target: ts.ScriptTarget.ESNext,
+          composite: false
         };
         compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
         compilerOptionsWithSourceMap = {
@@ -140,6 +141,30 @@ var rawPlugin = (options = {}, meta) => {
       if (transformTS) {
         const ts = await tsPromise;
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
+        const { fileExists: systemFileExists, readFile: systemReadFile } = system;
+        system.fileExists = (filename) => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemFileExists(filename);
+          if (fsMap.has(filename))
+            return true;
+          return systemFileExists(filename.slice(0, -4));
+        };
+        system.readFile = (filename, encoding = "utf-8") => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemReadFile(filename);
+          if (fsMap.has(filename))
+            return fsMap.get(filename);
+          const civetFilename = filename.slice(0, -4);
+          const rawCivetSource = fs.readFileSync(civetFilename, {
+            encoding
+          });
+          const compiledTS = import_civet.default.compile(rawCivetSource, {
+            filename,
+            js: false
+          });
+          fsMap.set(filename, compiledTS);
+          return compiledTS;
+        };
         const host = tsvfs.createVirtualCompilerHost(
           system,
           compilerOptions,
@@ -239,28 +264,28 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
-      return isCivetTranspiled(id);
+      return isCivetTranspiled.test(id);
     },
     async load(id) {
-      if (!isCivetTranspiled(id))
+      const match = isCivetTranspiled.exec(id);
+      if (!match)
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const basename = id.slice(0, match.index + match[1].length);
+      const filename = import_path.default.resolve(rootDir, basename);
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -351,11 +376,25 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
-        var _a;
+        var _a, _b, _c;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        config.optimizeDeps ?? (config.optimizeDeps = {});
+        (_a = config.optimizeDeps).esbuildOptions ?? (_a.esbuildOptions = {});
+        (_b = config.optimizeDeps.esbuildOptions).plugins ?? (_b.plugins = []);
+        config.optimizeDeps.esbuildOptions.plugins.push(
+          // @ts-ignore esbuild types from Vite might not match our esbuild
+          unplugin.esbuild({
+            ...options,
+            js: void 0,
+            ts: "preserve",
+            dts: void 0,
+            emitDeclaration: false,
+            typecheck: false
+          })
+        );
         if (implicitExtension) {
           config.resolve ?? (config.resolve = {});
-          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          (_c = config.resolve).extensions ?? (_c.extensions = []);
           config.resolve.extensions.push(".civet");
         }
       },
@@ -380,10 +419,10 @@ var rawPlugin = (options = {}, meta) => {
       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);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;
@@ -391,7 +430,8 @@ var rawPlugin = (options = {}, meta) => {
     }
   };
 };
-var src_default = (0, import_unplugin.createUnplugin)(rawPlugin);
+var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
+var src_default = unplugin;
 
 // src/esbuild.ts
 var esbuild_default = src_default.esbuild;

package/dist/main.js

@@ -2403,9 +2403,16 @@ function processDeclarationCondition(condition, rootCondition, parent) {
   const { decl, bindings } = condition.declaration;
   const binding = bindings[0];
   const { pattern, suffix, initializer, splices, thisAssignments } = binding;
+  const grandparent = condition.parent?.parent;
+  const children = (
+    // Check that the declaration is a plain assignment (no pattern-matching) and the immediate grandchild of an `if` or `while`
+    // More complex conditions (triggered by pattern matching or `until`/`unless`) don't need double parens
+    // @ts-ignore Just because pattern might not have a type at runtime doesn't mean it's unsafe
+    pattern.type === "Identifier" && (grandparent?.type === "IfStatement" || grandparent?.type === "WhileStatement") ? ["(", ref, initializer, ")"] : [ref, initializer]
+  );
   Object.assign(condition, {
     type: "AssignmentExpression",
-    children: [ref, initializer],
+    children,
     hoistDec: {
       type: "Declaration",
       children: ["let ", ref, suffix],
@@ -2879,7 +2886,13 @@ function processCoffeeInterpolation(s, parts, e, $loc) {
   };
 }
 function modifyString(str) {
-  return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
+  return str.replace(/((?:\\.|[^\r\n])*)(\r\n|\n|\r)?/gsu, function(_, chars, nl) {
+    if (nl) {
+      return chars + "\\n";
+    } else {
+      return chars;
+    }
+  });
 }
 function quoteString(str) {
   str = str.replace(/\\/g, "\\\\");

package/dist/main.mjs

@@ -2401,9 +2401,16 @@ function processDeclarationCondition(condition, rootCondition, parent) {
   const { decl, bindings } = condition.declaration;
   const binding = bindings[0];
   const { pattern, suffix, initializer, splices, thisAssignments } = binding;
+  const grandparent = condition.parent?.parent;
+  const children = (
+    // Check that the declaration is a plain assignment (no pattern-matching) and the immediate grandchild of an `if` or `while`
+    // More complex conditions (triggered by pattern matching or `until`/`unless`) don't need double parens
+    // @ts-ignore Just because pattern might not have a type at runtime doesn't mean it's unsafe
+    pattern.type === "Identifier" && (grandparent?.type === "IfStatement" || grandparent?.type === "WhileStatement") ? ["(", ref, initializer, ")"] : [ref, initializer]
+  );
   Object.assign(condition, {
     type: "AssignmentExpression",
-    children: [ref, initializer],
+    children,
     hoistDec: {
       type: "Declaration",
       children: ["let ", ref, suffix],
@@ -2877,7 +2884,13 @@ function processCoffeeInterpolation(s, parts, e, $loc) {
   };
 }
 function modifyString(str) {
-  return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
+  return str.replace(/((?:\\.|[^\r\n])*)(\r\n|\n|\r)?/gsu, function(_, chars, nl) {
+    if (nl) {
+      return chars + "\\n";
+    } else {
+      return chars;
+    }
+  });
 }
 function quoteString(str) {
   str = str.replace(/\\/g, "\\\\");

package/dist/rollup.js

@@ -42,7 +42,7 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
+var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
@@ -126,7 +126,8 @@ var rawPlugin = (options = {}, meta) => {
         );
         compilerOptions = {
           ...configContents.options,
-          target: ts.ScriptTarget.ESNext
+          target: ts.ScriptTarget.ESNext,
+          composite: false
         };
         compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
         compilerOptionsWithSourceMap = {
@@ -140,6 +141,30 @@ var rawPlugin = (options = {}, meta) => {
       if (transformTS) {
         const ts = await tsPromise;
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
+        const { fileExists: systemFileExists, readFile: systemReadFile } = system;
+        system.fileExists = (filename) => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemFileExists(filename);
+          if (fsMap.has(filename))
+            return true;
+          return systemFileExists(filename.slice(0, -4));
+        };
+        system.readFile = (filename, encoding = "utf-8") => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemReadFile(filename);
+          if (fsMap.has(filename))
+            return fsMap.get(filename);
+          const civetFilename = filename.slice(0, -4);
+          const rawCivetSource = fs.readFileSync(civetFilename, {
+            encoding
+          });
+          const compiledTS = import_civet.default.compile(rawCivetSource, {
+            filename,
+            js: false
+          });
+          fsMap.set(filename, compiledTS);
+          return compiledTS;
+        };
         const host = tsvfs.createVirtualCompilerHost(
           system,
           compilerOptions,
@@ -239,28 +264,28 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
-      return isCivetTranspiled(id);
+      return isCivetTranspiled.test(id);
     },
     async load(id) {
-      if (!isCivetTranspiled(id))
+      const match = isCivetTranspiled.exec(id);
+      if (!match)
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const basename = id.slice(0, match.index + match[1].length);
+      const filename = import_path.default.resolve(rootDir, basename);
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -351,11 +376,25 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
-        var _a;
+        var _a, _b, _c;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        config.optimizeDeps ?? (config.optimizeDeps = {});
+        (_a = config.optimizeDeps).esbuildOptions ?? (_a.esbuildOptions = {});
+        (_b = config.optimizeDeps.esbuildOptions).plugins ?? (_b.plugins = []);
+        config.optimizeDeps.esbuildOptions.plugins.push(
+          // @ts-ignore esbuild types from Vite might not match our esbuild
+          unplugin.esbuild({
+            ...options,
+            js: void 0,
+            ts: "preserve",
+            dts: void 0,
+            emitDeclaration: false,
+            typecheck: false
+          })
+        );
         if (implicitExtension) {
           config.resolve ?? (config.resolve = {});
-          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          (_c = config.resolve).extensions ?? (_c.extensions = []);
           config.resolve.extensions.push(".civet");
         }
       },
@@ -380,10 +419,10 @@ var rawPlugin = (options = {}, meta) => {
       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);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;
@@ -391,7 +430,8 @@ var rawPlugin = (options = {}, meta) => {
     }
   };
 };
-var src_default = (0, import_unplugin.createUnplugin)(rawPlugin);
+var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
+var src_default = unplugin;
 
 // src/rollup.ts
 var rollup_default = src_default.rollup;

package/dist/unplugin-shared.mjs

@@ -9,7 +9,7 @@ import * as fs from "fs";
 import path from "path";
 import * as tsvfs from "@typescript/vfs";
 import os from "os";
-var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
+var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = os.platform() === "win32";
 var windowsSlashRE = /\\/g;
@@ -93,7 +93,8 @@ var rawPlugin = (options = {}, meta) => {
         );
         compilerOptions = {
           ...configContents.options,
-          target: ts.ScriptTarget.ESNext
+          target: ts.ScriptTarget.ESNext,
+          composite: false
         };
         compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
         compilerOptionsWithSourceMap = {
@@ -107,6 +108,30 @@ var rawPlugin = (options = {}, meta) => {
       if (transformTS) {
         const ts = await tsPromise;
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
+        const { fileExists: systemFileExists, readFile: systemReadFile } = system;
+        system.fileExists = (filename) => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemFileExists(filename);
+          if (fsMap.has(filename))
+            return true;
+          return systemFileExists(filename.slice(0, -4));
+        };
+        system.readFile = (filename, encoding = "utf-8") => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemReadFile(filename);
+          if (fsMap.has(filename))
+            return fsMap.get(filename);
+          const civetFilename = filename.slice(0, -4);
+          const rawCivetSource = fs.readFileSync(civetFilename, {
+            encoding
+          });
+          const compiledTS = civet.compile(rawCivetSource, {
+            filename,
+            js: false
+          });
+          fsMap.set(filename, compiledTS);
+          return compiledTS;
+        };
         const host = tsvfs.createVirtualCompilerHost(
           system,
           compilerOptions,
@@ -206,28 +231,28 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = path.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : path.resolve(path.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = path.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : path.resolve(path.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = path.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
-      return isCivetTranspiled(id);
+      return isCivetTranspiled.test(id);
     },
     async load(id) {
-      if (!isCivetTranspiled(id))
+      const match = isCivetTranspiled.exec(id);
+      if (!match)
         return null;
-      const filename = path.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const basename = id.slice(0, match.index + match[1].length);
+      const filename = path.resolve(rootDir, basename);
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -318,11 +343,25 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
-        var _a;
+        var _a, _b, _c;
         rootDir = path.resolve(process.cwd(), config.root ?? "");
+        config.optimizeDeps ?? (config.optimizeDeps = {});
+        (_a = config.optimizeDeps).esbuildOptions ?? (_a.esbuildOptions = {});
+        (_b = config.optimizeDeps.esbuildOptions).plugins ?? (_b.plugins = []);
+        config.optimizeDeps.esbuildOptions.plugins.push(
+          // @ts-ignore esbuild types from Vite might not match our esbuild
+          unplugin.esbuild({
+            ...options,
+            js: void 0,
+            ts: "preserve",
+            dts: void 0,
+            emitDeclaration: false,
+            typecheck: false
+          })
+        );
         if (implicitExtension) {
           config.resolve ?? (config.resolve = {});
-          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          (_c = config.resolve).extensions ?? (_c.extensions = []);
           config.resolve.extensions.push(".civet");
         }
       },
@@ -347,10 +386,10 @@ var rawPlugin = (options = {}, meta) => {
       handleHotUpdate({ file, server, modules }) {
         if (!file.endsWith(".civet"))
           return;
-        const relativeId = slash(path.relative(process.cwd(), file) + outExt);
-        const module = server.moduleGraph.getModuleById(relativeId);
+        const resolvedId = slash(path.resolve(file) + outExt);
+        const module = server.moduleGraph.getModuleById(resolvedId);
         if (module) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module];
         }
         return modules;
@@ -358,7 +397,8 @@ var rawPlugin = (options = {}, meta) => {
     }
   };
 };
-var src_default = createUnplugin(rawPlugin);
+var unplugin = createUnplugin(rawPlugin);
+var src_default = unplugin;
 
 export {
   slash,

package/dist/unplugin.d.mts

@@ -1,4 +1,4 @@
-import * as unplugin from 'unplugin';
+import * as _unplugin from 'unplugin';
 import { TransformResult, createUnplugin } from 'unplugin';
 
 type PluginOptions = {
@@ -15,6 +15,6 @@ type PluginOptions = {
 };
 declare function slash(p: string): string;
 declare const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0];
-declare const _default: unplugin.UnpluginInstance<PluginOptions, boolean>;
+declare var unplugin: _unplugin.UnpluginInstance<PluginOptions, boolean>;
 
-export { PluginOptions, _default as default, rawPlugin, slash };
+export { PluginOptions, unplugin as default, rawPlugin, slash };

package/dist/unplugin.d.ts

@@ -1,4 +1,4 @@
-import * as unplugin from 'unplugin';
+import * as _unplugin from 'unplugin';
 import { TransformResult, createUnplugin } from 'unplugin';
 
 type PluginOptions = {
@@ -15,6 +15,6 @@ type PluginOptions = {
 };
 declare function slash(p: string): string;
 declare const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0];
-declare const _default: unplugin.UnpluginInstance<PluginOptions, boolean>;
+declare var unplugin: _unplugin.UnpluginInstance<PluginOptions, boolean>;
 
-export { PluginOptions, _default as default, rawPlugin, slash };
+export { PluginOptions, unplugin as default, rawPlugin, slash };

package/dist/unplugin.js

@@ -42,7 +42,7 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
+var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
@@ -126,7 +126,8 @@ var rawPlugin = (options = {}, meta) => {
         );
         compilerOptions = {
           ...configContents.options,
-          target: ts.ScriptTarget.ESNext
+          target: ts.ScriptTarget.ESNext,
+          composite: false
         };
         compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
         compilerOptionsWithSourceMap = {
@@ -140,6 +141,30 @@ var rawPlugin = (options = {}, meta) => {
       if (transformTS) {
         const ts = await tsPromise;
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
+        const { fileExists: systemFileExists, readFile: systemReadFile } = system;
+        system.fileExists = (filename) => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemFileExists(filename);
+          if (fsMap.has(filename))
+            return true;
+          return systemFileExists(filename.slice(0, -4));
+        };
+        system.readFile = (filename, encoding = "utf-8") => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemReadFile(filename);
+          if (fsMap.has(filename))
+            return fsMap.get(filename);
+          const civetFilename = filename.slice(0, -4);
+          const rawCivetSource = fs.readFileSync(civetFilename, {
+            encoding
+          });
+          const compiledTS = import_civet.default.compile(rawCivetSource, {
+            filename,
+            js: false
+          });
+          fsMap.set(filename, compiledTS);
+          return compiledTS;
+        };
         const host = tsvfs.createVirtualCompilerHost(
           system,
           compilerOptions,
@@ -239,28 +264,28 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
-      return isCivetTranspiled(id);
+      return isCivetTranspiled.test(id);
     },
     async load(id) {
-      if (!isCivetTranspiled(id))
+      const match = isCivetTranspiled.exec(id);
+      if (!match)
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const basename = id.slice(0, match.index + match[1].length);
+      const filename = import_path.default.resolve(rootDir, basename);
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -351,11 +376,25 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
-        var _a;
+        var _a, _b, _c;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        config.optimizeDeps ?? (config.optimizeDeps = {});
+        (_a = config.optimizeDeps).esbuildOptions ?? (_a.esbuildOptions = {});
+        (_b = config.optimizeDeps.esbuildOptions).plugins ?? (_b.plugins = []);
+        config.optimizeDeps.esbuildOptions.plugins.push(
+          // @ts-ignore esbuild types from Vite might not match our esbuild
+          unplugin.esbuild({
+            ...options,
+            js: void 0,
+            ts: "preserve",
+            dts: void 0,
+            emitDeclaration: false,
+            typecheck: false
+          })
+        );
         if (implicitExtension) {
           config.resolve ?? (config.resolve = {});
-          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          (_c = config.resolve).extensions ?? (_c.extensions = []);
           config.resolve.extensions.push(".civet");
         }
       },
@@ -380,10 +419,10 @@ var rawPlugin = (options = {}, meta) => {
       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);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;
@@ -391,7 +430,8 @@ var rawPlugin = (options = {}, meta) => {
     }
   };
 };
-var src_default = (0, import_unplugin.createUnplugin)(rawPlugin);
+var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
+var src_default = unplugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   rawPlugin,

package/dist/vite.js

@@ -42,7 +42,7 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
+var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
@@ -126,7 +126,8 @@ var rawPlugin = (options = {}, meta) => {
         );
         compilerOptions = {
           ...configContents.options,
-          target: ts.ScriptTarget.ESNext
+          target: ts.ScriptTarget.ESNext,
+          composite: false
         };
         compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
         compilerOptionsWithSourceMap = {
@@ -140,6 +141,30 @@ var rawPlugin = (options = {}, meta) => {
       if (transformTS) {
         const ts = await tsPromise;
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
+        const { fileExists: systemFileExists, readFile: systemReadFile } = system;
+        system.fileExists = (filename) => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemFileExists(filename);
+          if (fsMap.has(filename))
+            return true;
+          return systemFileExists(filename.slice(0, -4));
+        };
+        system.readFile = (filename, encoding = "utf-8") => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemReadFile(filename);
+          if (fsMap.has(filename))
+            return fsMap.get(filename);
+          const civetFilename = filename.slice(0, -4);
+          const rawCivetSource = fs.readFileSync(civetFilename, {
+            encoding
+          });
+          const compiledTS = import_civet.default.compile(rawCivetSource, {
+            filename,
+            js: false
+          });
+          fsMap.set(filename, compiledTS);
+          return compiledTS;
+        };
         const host = tsvfs.createVirtualCompilerHost(
           system,
           compilerOptions,
@@ -239,28 +264,28 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
-      return isCivetTranspiled(id);
+      return isCivetTranspiled.test(id);
     },
     async load(id) {
-      if (!isCivetTranspiled(id))
+      const match = isCivetTranspiled.exec(id);
+      if (!match)
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const basename = id.slice(0, match.index + match[1].length);
+      const filename = import_path.default.resolve(rootDir, basename);
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -351,11 +376,25 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
-        var _a;
+        var _a, _b, _c;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        config.optimizeDeps ?? (config.optimizeDeps = {});
+        (_a = config.optimizeDeps).esbuildOptions ?? (_a.esbuildOptions = {});
+        (_b = config.optimizeDeps.esbuildOptions).plugins ?? (_b.plugins = []);
+        config.optimizeDeps.esbuildOptions.plugins.push(
+          // @ts-ignore esbuild types from Vite might not match our esbuild
+          unplugin.esbuild({
+            ...options,
+            js: void 0,
+            ts: "preserve",
+            dts: void 0,
+            emitDeclaration: false,
+            typecheck: false
+          })
+        );
         if (implicitExtension) {
           config.resolve ?? (config.resolve = {});
-          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          (_c = config.resolve).extensions ?? (_c.extensions = []);
           config.resolve.extensions.push(".civet");
         }
       },
@@ -380,10 +419,10 @@ var rawPlugin = (options = {}, meta) => {
       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);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;
@@ -391,7 +430,8 @@ var rawPlugin = (options = {}, meta) => {
     }
   };
 };
-var src_default = (0, import_unplugin.createUnplugin)(rawPlugin);
+var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
+var src_default = unplugin;
 
 // src/vite.ts
 var vite_default = src_default.vite;

package/dist/webpack.js

@@ -42,7 +42,7 @@ var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var tsvfs = __toESM(require("@typescript/vfs"));
 var import_os = __toESM(require("os"));
-var isCivetTranspiled = (id) => /\.civet\.[jt]sx([?#].*)?$/.test(id);
+var isCivetTranspiled = /(\.civet)(\.[jt]sx)([?#].*)?$/;
 var postfixRE = /[?#].*$/s;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
@@ -126,7 +126,8 @@ var rawPlugin = (options = {}, meta) => {
         );
         compilerOptions = {
           ...configContents.options,
-          target: ts.ScriptTarget.ESNext
+          target: ts.ScriptTarget.ESNext,
+          composite: false
         };
         compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
         compilerOptionsWithSourceMap = {
@@ -140,6 +141,30 @@ var rawPlugin = (options = {}, meta) => {
       if (transformTS) {
         const ts = await tsPromise;
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
+        const { fileExists: systemFileExists, readFile: systemReadFile } = system;
+        system.fileExists = (filename) => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemFileExists(filename);
+          if (fsMap.has(filename))
+            return true;
+          return systemFileExists(filename.slice(0, -4));
+        };
+        system.readFile = (filename, encoding = "utf-8") => {
+          if (!filename.endsWith(".civet.tsx"))
+            return systemReadFile(filename);
+          if (fsMap.has(filename))
+            return fsMap.get(filename);
+          const civetFilename = filename.slice(0, -4);
+          const rawCivetSource = fs.readFileSync(civetFilename, {
+            encoding
+          });
+          const compiledTS = import_civet.default.compile(rawCivetSource, {
+            filename,
+            js: false
+          });
+          fsMap.set(filename, compiledTS);
+          return compiledTS;
+        };
         const host = tsvfs.createVirtualCompilerHost(
           system,
           compilerOptions,
@@ -239,28 +264,28 @@ var rawPlugin = (options = {}, meta) => {
       if (/\0/.test(id))
         return null;
       id = cleanCivetId(id);
-      const absolutePath = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
-      if (!absolutePath)
+      let resolvedId = import_path.default.isAbsolute(id) ? resolveAbsolutePath(rootDir, id, implicitExtension) : import_path.default.resolve(import_path.default.dirname(importer ?? ""), id);
+      if (!resolvedId)
         return null;
-      let relativeId = import_path.default.relative(process.cwd(), absolutePath);
-      if (!relativeId.endsWith(".civet")) {
+      if (!resolvedId.endsWith(".civet")) {
         if (!implicitExtension)
           return null;
-        const implicitId = implicitCivet(relativeId);
+        const implicitId = implicitCivet(resolvedId);
         if (!implicitId)
           return null;
-        relativeId = implicitId;
+        resolvedId = implicitId;
       }
-      const relativePath = relativeId + outExt;
-      return relativePath;
+      return resolvedId + outExt;
     },
     loadInclude(id) {
-      return isCivetTranspiled(id);
+      return isCivetTranspiled.test(id);
     },
     async load(id) {
-      if (!isCivetTranspiled(id))
+      const match = isCivetTranspiled.exec(id);
+      if (!match)
         return null;
-      const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
+      const basename = id.slice(0, match.index + match[1].length);
+      const filename = import_path.default.resolve(rootDir, basename);
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
@@ -351,11 +376,25 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
-        var _a;
+        var _a, _b, _c;
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        config.optimizeDeps ?? (config.optimizeDeps = {});
+        (_a = config.optimizeDeps).esbuildOptions ?? (_a.esbuildOptions = {});
+        (_b = config.optimizeDeps.esbuildOptions).plugins ?? (_b.plugins = []);
+        config.optimizeDeps.esbuildOptions.plugins.push(
+          // @ts-ignore esbuild types from Vite might not match our esbuild
+          unplugin.esbuild({
+            ...options,
+            js: void 0,
+            ts: "preserve",
+            dts: void 0,
+            emitDeclaration: false,
+            typecheck: false
+          })
+        );
         if (implicitExtension) {
           config.resolve ?? (config.resolve = {});
-          (_a = config.resolve).extensions ?? (_a.extensions = []);
+          (_c = config.resolve).extensions ?? (_c.extensions = []);
           config.resolve.extensions.push(".civet");
         }
       },
@@ -380,10 +419,10 @@ var rawPlugin = (options = {}, meta) => {
       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);
+        const resolvedId = slash(import_path.default.resolve(file) + outExt);
+        const module2 = server.moduleGraph.getModuleById(resolvedId);
         if (module2) {
-          server.moduleGraph.onFileChange(relativeId);
+          server.moduleGraph.onFileChange(resolvedId);
           return [...modules, module2];
         }
         return modules;
@@ -391,7 +430,8 @@ var rawPlugin = (options = {}, meta) => {
     }
   };
 };
-var src_default = (0, import_unplugin.createUnplugin)(rawPlugin);
+var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
+var src_default = unplugin;
 
 // src/webpack.ts
 var webpack_default = src_default.webpack;

package/package.json

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