@danielx/civet 0.11.6 → 0.11.7

package/dist/ts-diagnostic.js

@@ -47,7 +47,7 @@ function remapPosition(position, sourcemapLines) {
     const newChar = srcChar + character - lastMappingPosition;
     return {
       line: srcLine,
-      character: newChar
+      character: Math.max(0, newChar)
     };
   } else {
     return position;

package/dist/ts-diagnostic.mjs

@@ -22,7 +22,7 @@ function remapPosition(position, sourcemapLines) {
     const newChar = srcChar + character - lastMappingPosition;
     return {
       line: srcLine,
-      character: newChar
+      character: Math.max(0, newChar)
     };
   } else {
     return position;

package/dist/types.d.ts

@@ -22,6 +22,8 @@ declare module "@danielx/civet" {
     coffeePrototype: boolean
     coffeeRange: boolean
     defaultElement: string
+    esCompat: boolean
+    esArrowFunction: boolean
     globals: string[]
     implicitReturns: boolean
     jsxCode: boolean

package/dist/unplugin/astro.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/astro.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/astro.civet
 import civetUnplugin, {} from "./unplugin.mjs";
-var astro_civet_default = (function(opts = {}) {
+var astro_default = (function(opts = {}) {
   return {
     name: "@danielx/civet",
     hooks: {
@@ -17,5 +17,5 @@ var astro_civet_default = (function(opts = {}) {
   };
 });
 export {
-  astro_civet_default as default
+  astro_default as default
 };

package/dist/unplugin/esbuild.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => import("esbuild").Plugin;
+declare const _default: (options?: import("./unplugin.js").PluginOptions | undefined) => import("esbuild").Plugin;
 export default _default;

package/dist/unplugin/esbuild.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/esbuild.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/esbuild.civet
 import civetUnplugin from "./unplugin.mjs";
-var esbuild_civet_default = civetUnplugin.esbuild;
+var esbuild_default = civetUnplugin.esbuild;
 export {
-  esbuild_civet_default as default
+  esbuild_default as default
 };

package/dist/unplugin/farm.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/farm.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/farm.civet
 import civetUnplugin, {} from "./unplugin.mjs";
-var farm_civet_default = civetUnplugin.farm;
+var farm_default = civetUnplugin.farm;
 export {
-  farm_civet_default as default
+  farm_default as default
 };

package/dist/unplugin/rolldown.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => import("rolldown").Plugin<any> | import("rolldown").Plugin<any>[];
+declare const _default: (options?: import("./unplugin.js").PluginOptions | undefined) => import("unplugin").RolldownPlugin<any> | import("unplugin").RolldownPlugin<any>[];
 export default _default;

package/dist/unplugin/rolldown.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rolldown.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rolldown.civet
 import civetUnplugin from "./unplugin.mjs";
-var rolldown_civet_default = civetUnplugin.rolldown;
+var rolldown_default = civetUnplugin.rolldown;
 export {
-  rolldown_civet_default as default
+  rolldown_default as default
 };

package/dist/unplugin/rollup.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => import("unplugin").RollupPlugin<any> | import("unplugin").RollupPlugin<any>[];
+declare const _default: (options?: import("./unplugin.js").PluginOptions | undefined) => import("unplugin").RollupPlugin<any> | import("unplugin").RollupPlugin<any>[];
 export default _default;

package/dist/unplugin/rollup.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rollup.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rollup.civet
 import civetUnplugin from "./unplugin.mjs";
-var rollup_civet_default = civetUnplugin.rollup;
+var rollup_default = civetUnplugin.rollup;
 export {
-  rollup_civet_default as default
+  rollup_default as default
 };

package/dist/unplugin/rspack.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => RspackPluginInstance;
+declare const _default: (options?: import("./unplugin.js").PluginOptions | undefined) => RspackPluginInstance;
 export default _default;

package/dist/unplugin/rspack.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rspack.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rspack.civet
 import civetUnplugin from "./unplugin.mjs";
-var rspack_civet_default = civetUnplugin.rspack;
+var rspack_default = civetUnplugin.rspack;
 export {
-  rspack_civet_default as default
+  rspack_default as default
 };

package/dist/unplugin/unplugin.d.ts

@@ -1,5 +1,7 @@
-import { type TransformResult, createUnplugin } from 'unplugin';
+import { type TransformResult, type UnpluginContextMeta } from 'unplugin';
 import { type ParseOptions } from '@danielx/civet';
+import type { UserConfig } from 'vite';
+import type { BuildOptions } from 'esbuild';
 export type PluginOptions = {
     implicitExtension?: boolean;
     outputExtension?: string;
@@ -19,8 +21,30 @@ export type PluginOptions = {
     /** config filename, or false/null to not look for default config file */
     config?: string | false | null;
     parseOptions?: ParseOptions;
+    tsConfig?: any;
 };
 export declare function slash(p: string): string;
-export declare const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0];
-declare var unplugin: import("unplugin").UnpluginInstance<PluginOptions, boolean>;
+export declare const rawPlugin: (options: PluginOptions | undefined, meta: UnpluginContextMeta) => {
+    name: string;
+    enforce: "pre";
+    buildStart(this: import("unplugin").UnpluginBuildContext): Promise<void>;
+    buildEnd(this: import("unplugin").UnpluginBuildContext, useConfigFileNames?: boolean): Promise<void>;
+    resolveId(this: import("unplugin").UnpluginBuildContext & import("unplugin").UnpluginContext, id: string, importer: string | undefined, options: {
+        isEntry: boolean;
+    }): string | null;
+    loadInclude(id: string): boolean;
+    load(this: import("unplugin").UnpluginBuildContext & import("unplugin").UnpluginContext, id: string): Promise<TransformResult>;
+    esbuild: {
+        loader: "tsx" | "jsx";
+        config(options: BuildOptions): void;
+    };
+    vite: {
+        config(this: import("vite").ConfigPluginContext, config: UserConfig): void;
+        transformIndexHtml(this: import("vite").MinimalPluginContextWithoutEnvironment, html: string): string;
+        handleHotUpdate(this: import("vite").MinimalPluginContextWithoutEnvironment, { file, server, modules }: import("vite").HmrContext): import("vite").ModuleNode[] | undefined;
+    };
+    rspack(compiler: RspackCompiler): any;
+    webpack(compiler: import("unplugin").WebpackCompiler): (id: string) => string;
+};
+declare var unplugin: import("unplugin").UnpluginInstance<PluginOptions | undefined, boolean>;
 export default unplugin;

package/dist/unplugin/unplugin.js

@@ -357,14 +357,23 @@ var rawPlugin = (options = {}, meta) => {
         };
         var mogrify = mogrify2;
         const ts2 = await tsPromise;
-        const tsConfigPath = ts2.findConfigFile(process.cwd(), ts2.sys.fileExists);
-        if (!tsConfigPath) {
-          throw new Error("Could not find 'tsconfig.json'");
+        let config, error, tsConfigPath;
+        if (options.tsConfig) {
+          config = options.tsConfig;
+          if (options.tsConfig.rootDir) {
+            tsConfigPath = import_path.default.join(options.tsConfig.rootDir, "tsconfig.json");
+          }
+        } else {
+          tsConfigPath = ts2.findConfigFile(process.cwd(), ts2.sys.fileExists);
+          if (!tsConfigPath) {
+            throw new Error("Could not find 'tsconfig.json'");
+          }
+          ;
+          ({ config, error } = ts2.readConfigFile(
+            tsConfigPath,
+            ts2.sys.readFile
+          ));
         }
-        const { config, error } = ts2.readConfigFile(
-          tsConfigPath,
-          ts2.sys.readFile
-        );
         if (error) {
           console.error(ts2.formatDiagnostic(error, getFormatHost(ts2.sys)));
           throw error;
@@ -379,7 +388,9 @@ var rawPlugin = (options = {}, meta) => {
         const configContents = ts2.parseJsonConfigFileContent(
           config,
           system,
-          process.cwd()
+          tsConfigPath ? import_path.default.dirname(tsConfigPath) : process.cwd(),
+          void 0,
+          tsConfigPath
         );
         configErrors = configContents.errors;
         configFileNames = configContents.fileNames;
@@ -763,7 +774,7 @@ var rawPlugin = (options = {}, meta) => {
           config.resolve.extensions.push(".civet");
         }
       },
-      async transformIndexHtml(html) {
+      transformIndexHtml(html) {
         return html.replace(/<!--[^]*?-->|<[^<>]*>/g, (tag) => {
           return tag.replace(/<\s*script\b[^<>]*>/gi, (script) => {
             return script.replace(

package/dist/unplugin/unplugin.mjs

@@ -6,7 +6,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/unplugin.civet
 import { createUnplugin } from "unplugin";
 import civet, { decode, lib, SourceMap } from "@danielx/civet";
 import { findInDir, loadConfig } from "@danielx/civet/config";
@@ -187,7 +187,7 @@ var requirePath = function requirePath2() {
   return __require(String.fromCharCode(112, 97, 116, 104));
 };
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/unplugin.civet
 import os from "os";
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 var DiagnosticCategory = {};
@@ -331,14 +331,23 @@ var rawPlugin = (options = {}, meta) => {
           return;
         };
         const ts2 = await tsPromise;
-        const tsConfigPath = ts2.findConfigFile(process.cwd(), ts2.sys.fileExists);
-        if (!tsConfigPath) {
-          throw new Error("Could not find 'tsconfig.json'");
+        let config, error, tsConfigPath;
+        if (options.tsConfig) {
+          config = options.tsConfig;
+          if (options.tsConfig.rootDir) {
+            tsConfigPath = path.join(options.tsConfig.rootDir, "tsconfig.json");
+          }
+        } else {
+          tsConfigPath = ts2.findConfigFile(process.cwd(), ts2.sys.fileExists);
+          if (!tsConfigPath) {
+            throw new Error("Could not find 'tsconfig.json'");
+          }
+          ;
+          ({ config, error } = ts2.readConfigFile(
+            tsConfigPath,
+            ts2.sys.readFile
+          ));
         }
-        const { config, error } = ts2.readConfigFile(
-          tsConfigPath,
-          ts2.sys.readFile
-        );
         if (error) {
           console.error(ts2.formatDiagnostic(error, getFormatHost(ts2.sys)));
           throw error;
@@ -353,7 +362,9 @@ var rawPlugin = (options = {}, meta) => {
         const configContents = ts2.parseJsonConfigFileContent(
           config,
           system,
-          process.cwd()
+          tsConfigPath ? path.dirname(tsConfigPath) : process.cwd(),
+          void 0,
+          tsConfigPath
         );
         configErrors = configContents.errors;
         configFileNames = configContents.fileNames;
@@ -735,7 +746,7 @@ var rawPlugin = (options = {}, meta) => {
           config.resolve.extensions.push(".civet");
         }
       },
-      async transformIndexHtml(html) {
+      transformIndexHtml(html) {
         return html.replace(/<!--[^]*?-->|<[^<>]*>/g, (tag) => {
           return tag.replace(/<\s*script\b[^<>]*>/gi, (script) => {
             return script.replace(
@@ -806,9 +817,9 @@ var rawPlugin = (options = {}, meta) => {
   return plugin;
 };
 var unplugin = createUnplugin(rawPlugin);
-var unplugin_civet_default = unplugin;
+var unplugin_default = unplugin;
 export {
-  unplugin_civet_default as default,
+  unplugin_default as default,
   rawPlugin,
   slash
 };

package/dist/unplugin/vite.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => import("vite").Plugin<any> | import("vite").Plugin<any>[];
+declare const _default: (options?: import("./unplugin.js").PluginOptions | undefined) => import("vite").Plugin<any> | import("vite").Plugin<any>[];
 export default _default;

package/dist/unplugin/vite.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/vite.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/vite.civet
 import civetUnplugin from "./unplugin.mjs";
-var vite_civet_default = civetUnplugin.vite;
+var vite_default = civetUnplugin.vite;
 export {
-  vite_civet_default as default
+  vite_default as default
 };

package/dist/unplugin/webpack.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => import("unplugin").WebpackPluginInstance;
+declare const _default: (options?: import("./unplugin.js").PluginOptions | undefined) => import("unplugin").WebpackPluginInstance;
 export default _default;

package/dist/unplugin/webpack.mjs

@@ -1,8 +1,8 @@
 import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 
-// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/webpack.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/webpack.civet
 import civetUnplugin from "./unplugin.mjs";
-var webpack_civet_default = civetUnplugin.webpack;
+var webpack_default = civetUnplugin.webpack;
 export {
-  webpack_civet_default as default
+  webpack_default as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -104,6 +104,7 @@
     "test": "bash ./build/test.sh",
     "test:coverage": "cross-env CIVET_COVERAGE=1 bash ./build/test.sh",
     "test:self": "cross-env CIVET_SOURCE=./dist/main.js pnpm test",
+    "test:brk": "cross-env CIVET_THREADS=0 pnpm test --inspect-brk",
     "changelog": "civet build/changelog.civet",
     "release": "pnpm changelog --release"
   },
@@ -116,14 +117,14 @@
   "devDependencies": {
     "@babel/core": "^7.29.0",
     "@babel/parser": "^7.29.2",
-    "@danielx/civet": "0.9.4",
-    "@danielx/hera": "0.8.19",
+    "@danielx/civet": "0.11.6",
+    "@danielx/hera": "0.8.20",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.8",
     "@types/node": "^22.10.2",
     "@typescript/vfs": "^1.6.4",
-    "c8": "^7.12.0",
+    "c8": "^11.0.0",
     "cross-env": "7.0.3",
     "esbuild": "0.27.5",
     "marked": "^4.2.4",
@@ -133,7 +134,7 @@
     "terser": "^5.16.1",
     "tslib": "^2.4.0",
     "typescript": "^5.5.2",
-    "vite": "^8.0.3",
+    "vite": "^8.0.8",
     "vitepress": "^1.0.0-alpha.35",
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8",
@@ -180,7 +181,7 @@
       "serialize-javascript": "^7.0.3",
       "tmp": "^0.2.5",
       "lodash": "^4.18.0",
-      "esbuild": "^0.27.0",
+      "esbuild": "0.27.5",
       "diff": "^8.0.3"
     }
   }