@danielx/civet 0.7.8 → 0.7.10

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, {