@danielx/civet 0.7.8 → 0.7.10

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

@@ -57,14 +57,21 @@ declare module "@danielx/civet" {
 
   // TODO: Import ParseError class from Hera
   export type ParseError = {
-    message: string
-    name: string
+    name: "ParseError"
+    message: string // filename:line:column header\nbody
+    header: string
+    body: string
     filename: string
     line: number
     column: number
     offset: number
   }
-  export function isCompileError(err: any): err is ParseError
+  export type ParseErrors = {
+    name: "ParseErrors"
+    message: string
+    errors: ParseError[]
+  }
+  export function isCompileError(err: any): err is ParseError | ParseErrors
 
   type CompileOutput<T extends CompileOptions> =
     T extends { ast: true } ? CivetAST :
@@ -87,7 +94,7 @@ declare module "@danielx/civet" {
     isCompileError: typeof isCompileError
     parse: typeof parse
     generate: typeof generate
-    util: {
+    sourcemap: {
       locationTable(input: string): number[]
       lookupLineColumn(table: number[], pos: number): [number, number]
       SourceMap(input: string): SourceMap
@@ -112,11 +119,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.10",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -75,8 +75,8 @@
   },
   "devDependencies": {
     "@danielx/civet": "0.7.4",
-    "@danielx/hera": "^0.8.13",
-    "@prettier/sync": "^0.3.0",
+    "@danielx/hera": "^0.8.14",
+    "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^9.1.1",
     "@types/node": "^20.12.2",
@@ -84,7 +84,7 @@
     "esbuild": "0.20.0",
     "marked": "^4.2.4",
     "mocha": "^10.0.0",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.5",
     "terser": "^5.16.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",