@danielx/civet 0.7.8 → 0.7.9

package/README.md

@@ -219,60 +219,18 @@ could be a valid property `1.e10` → `1..e10`. The workaround is to add a trail
   console.log "hi"
   ```
 
-Comparison to CoffeeScript
----
+### Comparison to CoffeeScript
 
 Take a look at this [detailed Civet // CoffeeScript comparision](./notes/Comparison-to-CoffeeScript.md)
 
-ECMAScript Compatibility
----
-
-You can specify `"civet"` prologue directives to increase
-compatibility with ECMAScript/TypeScript:
-
-| Configuration       | What it enables |
-|---------------------|---------------------------------------|
-| -implicit-returns   | turn off implicit return of last value in functions |
-
-Put them at the top of your file:
-
-```
-"civet -implicit-returns"
-```
-
-Your can separate multiple options with spaces.
-
-Deno Compatibility
----
-
-TypeScript only allows importing `.ts` files as `.js`. Deno follows ESM and requires importing files with the correct extension.
-
-Civet automatically rewrites imports to work around [this issue](https://github.com/microsoft/TypeScript/issues/42151) in TS.
-
-When Civet detects it is running in Deno rewriting imports is turned off. If for some reason Civet fails to detect running in Deno
-you can turn off rewriting imports manually with these configuration options:
-
-| Configuration         | What it enables |
-|-----------------------|------------------------------------------|
-| -rewrite-ts-imports   | disable rewriting .ts -> .js in imports  |
-| deno                  | currently just disables rewriting imports but could add more deno specific options in the future |
+### Directives
 
-Other Options
----
-
-The `"civet"` prologue directive can also specify the following options:
-
-| Configuration       | What it enables |
-|---------------------|---------------------------------------|
-| rewrite-civet-imports=.ext | Rewrite `import "file.civet"` to `import "file.ext"` |
-| tab=NNN             | treat tab like NNN spaces (default=1) |
+Civet is not just one language; it can be configured in a variety of ways
+via directives to add or remove language features, or improve behavior
+in certain environments.
+See [config documentation](https://civet.dev/config).
 
-For example, `"civet tab=2"` or `"civet tab=4"` lets you mix tabs and spaces
-in a file and be treated like they'd render in VSCode with `editor.tabSize`
-set accordingly.
-
-Using Civet in your Node.js Environment
----
+### Using Civet in your Node.js Environment
 
 You have now been convinced that Civet is right for your current/next project. Here is how
 to set up your environment to get productive right away and have a Good Time℠.

package/dist/astro.d.mts

@@ -1,5 +1,6 @@
 import { PluginOptions } from './unplugin.mjs';
 import 'unplugin';
+import '@danielx/civet';
 
 interface AstroIntegration {
     name: string;

package/dist/astro.d.ts

@@ -1,5 +1,6 @@
 import { PluginOptions } from './unplugin.js';
 import 'unplugin';
+import '@danielx/civet';
 
 interface AstroIntegration {
     name: string;

package/dist/astro.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(astro_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_config = require("@danielx/civet/config");
 var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
@@ -90,6 +91,7 @@ var rawPlugin = (options = {}, meta) => {
     options.emitDeclaration = options.dts;
   if (options.js)
     options.ts = "civet";
+  let compileOptions = {};
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
@@ -112,12 +114,20 @@ var rawPlugin = (options = {}, meta) => {
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
         const ts = await tsPromise;
-        const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-        if (!configPath) {
+        const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
+        if (civetConfigPath) {
+          compileOptions = await (0, import_config.loadConfig)(civetConfigPath);
+        }
+        compileOptions.parseOptions = {
+          ...compileOptions.parseOptions,
+          ...options.parseOptions
+        };
+        const tsConfigPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        if (!tsConfigPath) {
           throw new Error("Could not find 'tsconfig.json'");
         }
         const { config, error } = ts.readConfigFile(
-          configPath,
+          tsConfigPath,
           ts.sys.readFile
         );
         if (error) {
@@ -164,9 +174,9 @@ var rawPlugin = (options = {}, meta) => {
             encoding
           });
           const compiledTS = import_civet.default.compile(rawCivetSource, {
+            ...compileOptions,
             filename,
             js: false,
-            comptime: Boolean(options.comptime),
             sync: true
             // TS readFile API seems to need to be synchronous
           });
@@ -314,11 +324,9 @@ var rawPlugin = (options = {}, meta) => {
       this.addWatchFile(filename);
       let compiled;
       const civetOptions = {
+        ...compileOptions,
         filename: id,
-        sourceMap: true,
-        parseOptions: {
-          comptime: Boolean(options.comptime)
-        }
+        sourceMap: true
       };
       if (options.ts === "civet" && !transformTS) {
         compiled = await import_civet.default.compile(rawCivetSource, {

package/dist/browser.js

@@ -38,9 +38,9 @@ var Civet = (() => {
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-  // node_modules/.pnpm/@danielx+hera@0.8.13/node_modules/@danielx/hera/dist/machine.js
+  // ../Hera/dist/machine.js
   var require_machine = __commonJS({
-    "node_modules/.pnpm/@danielx+hera@0.8.13/node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+    "../Hera/dist/machine.js"(exports, module) {
       "use strict";
       var __defProp2 = Object.defineProperty;
       var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -7035,7 +7035,7 @@ ${js}`
   var $R3 = (0, import_lib3.$R)(new RegExp("[0-9]", "suy"));
   var $R4 = (0, import_lib3.$R)(new RegExp("(?!\\p{ID_Start}|[_$0-9(\\[{])", "suy"));
   var $R5 = (0, import_lib3.$R)(new RegExp("[ \\t]", "suy"));
-  var $R6 = (0, import_lib3.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$.])", "suy"));
+  var $R6 = (0, import_lib3.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$.#])", "suy"));
   var $R7 = (0, import_lib3.$R)(new RegExp("[&=]", "suy"));
   var $R8 = (0, import_lib3.$R)(new RegExp("(?=['\"`])", "suy"));
   var $R9 = (0, import_lib3.$R)(new RegExp("(?=[\\/?])", "suy"));
@@ -8009,7 +8009,7 @@ ${js}`
   function ParenthesizedExpression(ctx, state2) {
     return (0, import_lib3.$EVENT)(ctx, state2, "ParenthesizedExpression", ParenthesizedExpression$0);
   }
-  var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /(?:\\p{ID_Continue}|[\\u200C\\u200D$.])/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
+  var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /(?:\\p{ID_Continue}|[\\u200C\\u200D$.#])/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
     var dot = $1;
     var typeSuffix = $3;
     return {

package/dist/config.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var config_exports = {};
 __export(config_exports, {
   findConfig: () => findConfig,
+  findInDir: () => findInDir,
   loadConfig: () => loadConfig
 });
 module.exports = __toCommonJS(config_exports);
@@ -41,14 +42,16 @@ var configFileNames = /* @__PURE__ */ new Set([
   "\u{1F408}.json",
   "\u{1F408}.civet",
   "civetconfig.json",
-  "civetconfig.civet"
+  "civetconfig.civet",
+  "civet.config.json",
+  "civet.config.civet"
 ]);
 async function findInDir(dirPath) {
   for (const entryName of await import_promises.default.readdir(dirPath)) {
     const entryPath = import_path.default.join(dirPath, entryName);
     if (entryName === ".config" && await (async () => {
       try {
-        return (await import_promises.default.stat(entryPath)).isDir();
+        return (await import_promises.default.stat(entryPath)).isDirectory();
       } catch (e) {
         return;
       }
@@ -119,5 +122,6 @@ async function loadConfig(path2) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   findConfig,
+  findInDir,
   loadConfig
 });

package/dist/esbuild.d.mts

@@ -1,6 +1,7 @@
 import * as esbuild from 'esbuild';
 import { PluginOptions } from './unplugin.mjs';
 import 'unplugin';
+import '@danielx/civet';
 
 declare const _default: (options: PluginOptions) => esbuild.Plugin;
 

package/dist/esbuild.d.ts

@@ -1,6 +1,7 @@
 import * as esbuild from 'esbuild';
 import { PluginOptions } from './unplugin.js';
 import 'unplugin';
+import '@danielx/civet';
 
 declare const _default: (options: PluginOptions) => esbuild.Plugin;
 

package/dist/esbuild.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(esbuild_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_config = require("@danielx/civet/config");
 var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
@@ -90,6 +91,7 @@ var rawPlugin = (options = {}, meta) => {
     options.emitDeclaration = options.dts;
   if (options.js)
     options.ts = "civet";
+  let compileOptions = {};
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
@@ -112,12 +114,20 @@ var rawPlugin = (options = {}, meta) => {
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
         const ts = await tsPromise;
-        const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-        if (!configPath) {
+        const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
+        if (civetConfigPath) {
+          compileOptions = await (0, import_config.loadConfig)(civetConfigPath);
+        }
+        compileOptions.parseOptions = {
+          ...compileOptions.parseOptions,
+          ...options.parseOptions
+        };
+        const tsConfigPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        if (!tsConfigPath) {
           throw new Error("Could not find 'tsconfig.json'");
         }
         const { config, error } = ts.readConfigFile(
-          configPath,
+          tsConfigPath,
           ts.sys.readFile
         );
         if (error) {
@@ -164,9 +174,9 @@ var rawPlugin = (options = {}, meta) => {
             encoding
           });
           const compiledTS = import_civet.default.compile(rawCivetSource, {
+            ...compileOptions,
             filename,
             js: false,
-            comptime: Boolean(options.comptime),
             sync: true
             // TS readFile API seems to need to be synchronous
           });
@@ -314,11 +324,9 @@ var rawPlugin = (options = {}, meta) => {
       this.addWatchFile(filename);
       let compiled;
       const civetOptions = {
+        ...compileOptions,
         filename: id,
-        sourceMap: true,
-        parseOptions: {
-          comptime: Boolean(options.comptime)
-        }
+        sourceMap: true
       };
       if (options.ts === "civet" && !transformTS) {
         compiled = await import_civet.default.compile(rawCivetSource, {

package/dist/main.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// node_modules/.pnpm/@danielx+hera@0.8.13/node_modules/@danielx/hera/dist/machine.js
+// ../Hera/dist/machine.js
 var require_machine = __commonJS({
-  "node_modules/.pnpm/@danielx+hera@0.8.13/node_modules/@danielx/hera/dist/machine.js"(exports2, module2) {
+  "../Hera/dist/machine.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -7013,7 +7013,7 @@ var $R2 = (0, import_lib3.$R)(new RegExp("(as|of|satisfies|then|when|implements|
 var $R3 = (0, import_lib3.$R)(new RegExp("[0-9]", "suy"));
 var $R4 = (0, import_lib3.$R)(new RegExp("(?!\\p{ID_Start}|[_$0-9(\\[{])", "suy"));
 var $R5 = (0, import_lib3.$R)(new RegExp("[ \\t]", "suy"));
-var $R6 = (0, import_lib3.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$.])", "suy"));
+var $R6 = (0, import_lib3.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$.#])", "suy"));
 var $R7 = (0, import_lib3.$R)(new RegExp("[&=]", "suy"));
 var $R8 = (0, import_lib3.$R)(new RegExp("(?=['\"`])", "suy"));
 var $R9 = (0, import_lib3.$R)(new RegExp("(?=[\\/?])", "suy"));
@@ -7987,7 +7987,7 @@ var ParenthesizedExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenPar
 function ParenthesizedExpression(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ParenthesizedExpression", ParenthesizedExpression$0);
 }
-var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /(?:\\p{ID_Continue}|[\\u200C\\u200D$.])/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
+var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /(?:\\p{ID_Continue}|[\\u200C\\u200D$.#])/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
   var dot = $1;
   var typeSuffix = $3;
   return {

package/dist/main.mjs

@@ -28,9 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/.pnpm/@danielx+hera@0.8.13/node_modules/@danielx/hera/dist/machine.js
+// ../Hera/dist/machine.js
 var require_machine = __commonJS({
-  "node_modules/.pnpm/@danielx+hera@0.8.13/node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+  "../Hera/dist/machine.js"(exports, module) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -6995,7 +6995,7 @@ var $R2 = (0, import_lib3.$R)(new RegExp("(as|of|satisfies|then|when|implements|
 var $R3 = (0, import_lib3.$R)(new RegExp("[0-9]", "suy"));
 var $R4 = (0, import_lib3.$R)(new RegExp("(?!\\p{ID_Start}|[_$0-9(\\[{])", "suy"));
 var $R5 = (0, import_lib3.$R)(new RegExp("[ \\t]", "suy"));
-var $R6 = (0, import_lib3.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$.])", "suy"));
+var $R6 = (0, import_lib3.$R)(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$.#])", "suy"));
 var $R7 = (0, import_lib3.$R)(new RegExp("[&=]", "suy"));
 var $R8 = (0, import_lib3.$R)(new RegExp("(?=['\"`])", "suy"));
 var $R9 = (0, import_lib3.$R)(new RegExp("(?=[\\/?])", "suy"));
@@ -7969,7 +7969,7 @@ var ParenthesizedExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenPar
 function ParenthesizedExpression(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ParenthesizedExpression", ParenthesizedExpression$0);
 }
-var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /(?:\\p{ID_Continue}|[\\u200C\\u200D$.])/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
+var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /(?:\\p{ID_Continue}|[\\u200C\\u200D$.#])/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
   var dot = $1;
   var typeSuffix = $3;
   return {

package/dist/rollup.d.mts

@@ -1,6 +1,8 @@
-import * as unplugin from 'unplugin';
+import * as rollup from 'rollup';
 import { PluginOptions } from './unplugin.mjs';
+import 'unplugin';
+import '@danielx/civet';
 
-declare const _default: (options: PluginOptions) => unplugin.RollupPlugin<any> | unplugin.RollupPlugin<any>[];
+declare const _default: (options: PluginOptions) => rollup.Plugin | rollup.Plugin[];
 
 export { _default as default };

package/dist/rollup.d.ts

@@ -1,6 +1,8 @@
-import * as unplugin from 'unplugin';
+import * as rollup from 'rollup';
 import { PluginOptions } from './unplugin.js';
+import 'unplugin';
+import '@danielx/civet';
 
-declare const _default: (options: PluginOptions) => unplugin.RollupPlugin<any> | unplugin.RollupPlugin<any>[];
+declare const _default: (options: PluginOptions) => rollup.Plugin | rollup.Plugin[];
 
 export { _default as default };

package/dist/rollup.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(rollup_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_config = require("@danielx/civet/config");
 var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
@@ -90,6 +91,7 @@ var rawPlugin = (options = {}, meta) => {
     options.emitDeclaration = options.dts;
   if (options.js)
     options.ts = "civet";
+  let compileOptions = {};
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
@@ -112,12 +114,20 @@ var rawPlugin = (options = {}, meta) => {
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
         const ts = await tsPromise;
-        const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-        if (!configPath) {
+        const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
+        if (civetConfigPath) {
+          compileOptions = await (0, import_config.loadConfig)(civetConfigPath);
+        }
+        compileOptions.parseOptions = {
+          ...compileOptions.parseOptions,
+          ...options.parseOptions
+        };
+        const tsConfigPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        if (!tsConfigPath) {
           throw new Error("Could not find 'tsconfig.json'");
         }
         const { config, error } = ts.readConfigFile(
-          configPath,
+          tsConfigPath,
           ts.sys.readFile
         );
         if (error) {
@@ -164,9 +174,9 @@ var rawPlugin = (options = {}, meta) => {
             encoding
           });
           const compiledTS = import_civet.default.compile(rawCivetSource, {
+            ...compileOptions,
             filename,
             js: false,
-            comptime: Boolean(options.comptime),
             sync: true
             // TS readFile API seems to need to be synchronous
           });
@@ -314,11 +324,9 @@ var rawPlugin = (options = {}, meta) => {
       this.addWatchFile(filename);
       let compiled;
       const civetOptions = {
+        ...compileOptions,
         filename: id,
-        sourceMap: true,
-        parseOptions: {
-          comptime: Boolean(options.comptime)
-        }
+        sourceMap: true
       };
       if (options.ts === "civet" && !transformTS) {
         compiled = await import_civet.default.compile(rawCivetSource, {

package/dist/types.d.ts

@@ -112,11 +112,14 @@ declare module "@danielx/civet/esbuild-plugin" {
 }
 
 declare module "@danielx/civet/config" {
-  const Config: {
-    findConfig: (path: string) => Promise<string | null>
-    loadConfig: (
-      path: string
-    ) => Promise<import("@danielx/civet").CompileOptions>
+  export function findInDir(dirPath: string): Promise<string | undefined>
+  export function findConfig(path: string): Promise<string | null>
+  export function loadConfig(
+    path: string
+  ): Promise<import("@danielx/civet").CompileOptions>
+  export default {
+    findInDir: typeof findInDir,
+    findConfig: typeof findConfig,
+    loadConfig: typeof loadConfig,
   }
-  export default Config
 }

package/dist/unplugin-shared.mjs

@@ -1,6 +1,7 @@
 // src/index.ts
 import { createUnplugin } from "unplugin";
 import civet from "@danielx/civet";
+import { findInDir, loadConfig } from "@danielx/civet/config";
 import {
   remapRange,
   flattenDiagnosticMessageText
@@ -57,6 +58,7 @@ var rawPlugin = (options = {}, meta) => {
     options.emitDeclaration = options.dts;
   if (options.js)
     options.ts = "civet";
+  let compileOptions = {};
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
@@ -79,12 +81,20 @@ var rawPlugin = (options = {}, meta) => {
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
         const ts = await tsPromise;
-        const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-        if (!configPath) {
+        const civetConfigPath = "config" in options ? options.config : await findInDir(process.cwd());
+        if (civetConfigPath) {
+          compileOptions = await loadConfig(civetConfigPath);
+        }
+        compileOptions.parseOptions = {
+          ...compileOptions.parseOptions,
+          ...options.parseOptions
+        };
+        const tsConfigPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        if (!tsConfigPath) {
           throw new Error("Could not find 'tsconfig.json'");
         }
         const { config, error } = ts.readConfigFile(
-          configPath,
+          tsConfigPath,
           ts.sys.readFile
         );
         if (error) {
@@ -131,9 +141,9 @@ var rawPlugin = (options = {}, meta) => {
             encoding
           });
           const compiledTS = civet.compile(rawCivetSource, {
+            ...compileOptions,
             filename,
             js: false,
-            comptime: Boolean(options.comptime),
             sync: true
             // TS readFile API seems to need to be synchronous
           });
@@ -281,11 +291,9 @@ var rawPlugin = (options = {}, meta) => {
       this.addWatchFile(filename);
       let compiled;
       const civetOptions = {
+        ...compileOptions,
         filename: id,
-        sourceMap: true,
-        parseOptions: {
-          comptime: Boolean(options.comptime)
-        }
+        sourceMap: true
       };
       if (options.ts === "civet" && !transformTS) {
         compiled = await civet.compile(rawCivetSource, {

package/dist/unplugin.d.mts

@@ -1,5 +1,6 @@
-import * as unplugin$1 from 'unplugin';
+import * as _unplugin from 'unplugin';
 import { TransformResult, createUnplugin } from 'unplugin';
+import { ParseOptions } from '@danielx/civet';
 
 type PluginOptions = {
     implicitExtension?: boolean;
@@ -12,10 +13,12 @@ type PluginOptions = {
     js?: boolean;
     /** @deprecated Use "emitDeclaration" instead */
     dts?: boolean;
-    comptime?: boolean;
+    /** config filename, or null to not look for default config file */
+    config?: string | null | undefined;
+    parseOptions?: ParseOptions;
 };
 declare function slash(p: string): string;
 declare const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0];
-declare var unplugin: unplugin$1.UnpluginInstance<PluginOptions, boolean>;
+declare var unplugin: _unplugin.UnpluginInstance<PluginOptions, boolean>;
 
-export { type PluginOptions, unplugin as default, rawPlugin, slash };
+export { PluginOptions, unplugin as default, rawPlugin, slash };

package/dist/unplugin.d.ts

@@ -1,5 +1,6 @@
-import * as unplugin$1 from 'unplugin';
+import * as _unplugin from 'unplugin';
 import { TransformResult, createUnplugin } from 'unplugin';
+import { ParseOptions } from '@danielx/civet';
 
 type PluginOptions = {
     implicitExtension?: boolean;
@@ -12,10 +13,12 @@ type PluginOptions = {
     js?: boolean;
     /** @deprecated Use "emitDeclaration" instead */
     dts?: boolean;
-    comptime?: boolean;
+    /** config filename, or null to not look for default config file */
+    config?: string | null | undefined;
+    parseOptions?: ParseOptions;
 };
 declare function slash(p: string): string;
 declare const rawPlugin: Parameters<typeof createUnplugin<PluginOptions>>[0];
-declare var unplugin: unplugin$1.UnpluginInstance<PluginOptions, boolean>;
+declare var unplugin: _unplugin.UnpluginInstance<PluginOptions, boolean>;
 
-export { type PluginOptions, unplugin as default, rawPlugin, slash };
+export { PluginOptions, unplugin as default, rawPlugin, slash };

package/dist/unplugin.js

@@ -37,6 +37,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_config = require("@danielx/civet/config");
 var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
@@ -90,6 +91,7 @@ var rawPlugin = (options = {}, meta) => {
     options.emitDeclaration = options.dts;
   if (options.js)
     options.ts = "civet";
+  let compileOptions = {};
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
@@ -112,12 +114,20 @@ var rawPlugin = (options = {}, meta) => {
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
         const ts = await tsPromise;
-        const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-        if (!configPath) {
+        const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
+        if (civetConfigPath) {
+          compileOptions = await (0, import_config.loadConfig)(civetConfigPath);
+        }
+        compileOptions.parseOptions = {
+          ...compileOptions.parseOptions,
+          ...options.parseOptions
+        };
+        const tsConfigPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        if (!tsConfigPath) {
           throw new Error("Could not find 'tsconfig.json'");
         }
         const { config, error } = ts.readConfigFile(
-          configPath,
+          tsConfigPath,
           ts.sys.readFile
         );
         if (error) {
@@ -164,9 +174,9 @@ var rawPlugin = (options = {}, meta) => {
             encoding
           });
           const compiledTS = import_civet.default.compile(rawCivetSource, {
+            ...compileOptions,
             filename,
             js: false,
-            comptime: Boolean(options.comptime),
             sync: true
             // TS readFile API seems to need to be synchronous
           });
@@ -314,11 +324,9 @@ var rawPlugin = (options = {}, meta) => {
       this.addWatchFile(filename);
       let compiled;
       const civetOptions = {
+        ...compileOptions,
         filename: id,
-        sourceMap: true,
-        parseOptions: {
-          comptime: Boolean(options.comptime)
-        }
+        sourceMap: true
       };
       if (options.ts === "civet" && !transformTS) {
         compiled = await import_civet.default.compile(rawCivetSource, {

package/dist/vite.d.mts

@@ -1,6 +1,7 @@
 import * as vite from 'vite';
 import { PluginOptions } from './unplugin.mjs';
 import 'unplugin';
+import '@danielx/civet';
 
 declare const _default: (options: PluginOptions) => vite.Plugin | vite.Plugin[];
 

package/dist/vite.d.ts

@@ -1,6 +1,7 @@
 import * as vite from 'vite';
 import { PluginOptions } from './unplugin.js';
 import 'unplugin';
+import '@danielx/civet';
 
 declare const _default: (options: PluginOptions) => vite.Plugin | vite.Plugin[];
 

package/dist/vite.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(vite_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_config = require("@danielx/civet/config");
 var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
@@ -90,6 +91,7 @@ var rawPlugin = (options = {}, meta) => {
     options.emitDeclaration = options.dts;
   if (options.js)
     options.ts = "civet";
+  let compileOptions = {};
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
@@ -112,12 +114,20 @@ var rawPlugin = (options = {}, meta) => {
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
         const ts = await tsPromise;
-        const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-        if (!configPath) {
+        const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
+        if (civetConfigPath) {
+          compileOptions = await (0, import_config.loadConfig)(civetConfigPath);
+        }
+        compileOptions.parseOptions = {
+          ...compileOptions.parseOptions,
+          ...options.parseOptions
+        };
+        const tsConfigPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        if (!tsConfigPath) {
           throw new Error("Could not find 'tsconfig.json'");
         }
         const { config, error } = ts.readConfigFile(
-          configPath,
+          tsConfigPath,
           ts.sys.readFile
         );
         if (error) {
@@ -164,9 +174,9 @@ var rawPlugin = (options = {}, meta) => {
             encoding
           });
           const compiledTS = import_civet.default.compile(rawCivetSource, {
+            ...compileOptions,
             filename,
             js: false,
-            comptime: Boolean(options.comptime),
             sync: true
             // TS readFile API seems to need to be synchronous
           });
@@ -314,11 +324,9 @@ var rawPlugin = (options = {}, meta) => {
       this.addWatchFile(filename);
       let compiled;
       const civetOptions = {
+        ...compileOptions,
         filename: id,
-        sourceMap: true,
-        parseOptions: {
-          comptime: Boolean(options.comptime)
-        }
+        sourceMap: true
       };
       if (options.ts === "civet" && !transformTS) {
         compiled = await import_civet.default.compile(rawCivetSource, {

package/dist/webpack.d.mts

@@ -1,5 +1,6 @@
 import { PluginOptions } from './unplugin.mjs';
 import 'unplugin';
+import '@danielx/civet';
 
 declare const _default: (options: PluginOptions) => WebpackPluginInstance;
 

package/dist/webpack.d.ts

@@ -1,5 +1,6 @@
 import { PluginOptions } from './unplugin.js';
 import 'unplugin';
+import '@danielx/civet';
 
 declare const _default: (options: PluginOptions) => WebpackPluginInstance;
 

package/dist/webpack.js

@@ -37,6 +37,7 @@ module.exports = __toCommonJS(webpack_exports);
 // src/index.ts
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
+var import_config = require("@danielx/civet/config");
 var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
@@ -90,6 +91,7 @@ var rawPlugin = (options = {}, meta) => {
     options.emitDeclaration = options.dts;
   if (options.js)
     options.ts = "civet";
+  let compileOptions = {};
   const transformTS = options.emitDeclaration || options.typecheck;
   const outExt = options.outputExtension ?? (options.ts === "preserve" ? ".tsx" : ".jsx");
   const implicitExtension = options.implicitExtension ?? true;
@@ -112,12 +114,20 @@ var rawPlugin = (options = {}, meta) => {
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
         const ts = await tsPromise;
-        const configPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-        if (!configPath) {
+        const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
+        if (civetConfigPath) {
+          compileOptions = await (0, import_config.loadConfig)(civetConfigPath);
+        }
+        compileOptions.parseOptions = {
+          ...compileOptions.parseOptions,
+          ...options.parseOptions
+        };
+        const tsConfigPath = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
+        if (!tsConfigPath) {
           throw new Error("Could not find 'tsconfig.json'");
         }
         const { config, error } = ts.readConfigFile(
-          configPath,
+          tsConfigPath,
           ts.sys.readFile
         );
         if (error) {
@@ -164,9 +174,9 @@ var rawPlugin = (options = {}, meta) => {
             encoding
           });
           const compiledTS = import_civet.default.compile(rawCivetSource, {
+            ...compileOptions,
             filename,
             js: false,
-            comptime: Boolean(options.comptime),
             sync: true
             // TS readFile API seems to need to be synchronous
           });
@@ -314,11 +324,9 @@ var rawPlugin = (options = {}, meta) => {
       this.addWatchFile(filename);
       let compiled;
       const civetOptions = {
+        ...compileOptions,
         filename: id,
-        sourceMap: true,
-        parseOptions: {
-          comptime: Boolean(options.comptime)
-        }
+        sourceMap: true
       };
       if (options.ts === "civet" && !transformTS) {
         compiled = await import_civet.default.compile(rawCivetSource, {

package/package.json

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