@danielx/civet 0.10.5 → 0.10.7

package/dist/node-worker.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/node-worker.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\node-worker.civet.jsx
 import { parentPort } from "node:worker_threads";
 import module from "node:module";
 try {

package/dist/types.d.ts

@@ -26,6 +26,13 @@ declare module "@danielx/civet" {
     implicitReturns: boolean
     jsxCode: boolean
     objectIs: boolean
+    /** Array of names to treat as operators, or object mapping names to
+     * parsable operator behaviors such as "relational" or "same (+)" or
+     * "relational same (+)", or ""/undefined for default behavior.
+     * (Can also map to OperatorBehavior as defined in source/types.civet,
+     * but the details are subject to change.)
+     */
+    operators: string[] | Record<string, string?>
     react: boolean
     solid: boolean
     client: boolean
@@ -41,25 +48,92 @@ declare module "@danielx/civet" {
     repl: boolean
   }>
   export type CompileOptions = {
+    /**
+     * If your Civet code comes from a file, provide it here. This gets used
+     * in sourcemaps and error messages.
+     */
     filename?: string
+    /**
+     * Whether to return a source map in addition to transpiled code.
+     * If false (the default), `compile` just returns transpiled code.
+     * If true (and `inlineMap` is false/unspecified),
+     * `compile` returns an object `{code, sourceMap}` whose `code` property
+     * is transpiled code and `sourceMap` property is a `SourceMap` object.
+     */
     sourceMap?: boolean
+    /**
+     * Whether to inline a source map as a final comment in the transpiled code.
+     * Default is false.
+     */
     inlineMap?: boolean
+    /**
+     * Whether to return an AST of the parsed code instead of transpiled code.
+     * Default is false.
+     * If true, `compile` skips the `generate` step that turns the parsed AST
+     * into a code string, and just returns the AST itself.
+     * If "raw", `compile` also skips the `prune` step, which leaves some
+     * extra properties on the AST nodes (e.g. `parent` pointers) and
+     * preserves that `children` is always an array.
+     */
     ast?: boolean | "raw"
+    /**
+     * Whether Civet should convert TypeScript syntax to JavaScript.
+     * This mostly triggers the removal of type annotations, but some
+     * TypeScript features such as `enum` are also supported.
+     * Default is false.
+     */
     js?: boolean
+    /**
+     * If set to true, turns off the compiler cache of compiled subexpressions.
+     * This should not affect the compilation output,
+     * and can make the compiler exponentially slow.
+     * It is mainly for testing whether there is a bug in the compiler cache.
+     */
     noCache?: boolean
+    /**
+     * If specified, also writes data about compiler cache performance
+     * into the specified filename. Useful for debugging caching performance.
+     */
     hits?: string
+    /**
+     * If specified, also writes data about all parse branches considered by
+     * the compiler into the specified filename.
+     * Useful for debugging why something parsed the way it did.
+     */
     trace?: string
+    /**
+     * Initial parse options, e.g., read from a config file.
+     * They can still be overridden in the code by "civet" pragmas.
+     */
     parseOptions?: ParseOptions
-    /** Specifying an empty array will prevent ParseErrors from being thrown */
+    /**
+     * By default, `compile` will throw a `ParseErrors` containing all
+     * `ParseError`s encountered during compilation.
+     * If you specify an empty array, `compile` will not throw and instead
+     * will add to the array all `ParseError`s encountered.
+     */
     errors?: ParseError[]
-    /** Number of parallel threads to compile with (Node only) */
+    /**
+     * Number of parallel threads to compile with (Node only).
+     * Default is to use the environment variable `CIVET_THREADS`, or 0.
+     * If nonzero, spawns up to that many worker threads so that multiple
+     * calls to `compile` will end up running in parallel.
+     * If `CIVET_THREADS` is set to 0, the `threads` option is ignored.
+     */
     threads?: number
+    /**
+     * If false (the default), runs the compiler asynchronously and returns
+     * a Promise (for the transpiled string or `{code, sourceMap}` object).
+     * If true, runs the compiler synchronously and returns the result directly.
+     * Sync mode disables some features:
+     *   - parallel computation via `threads`
+     *   - comptime code can't return promises
+     */
+    sync?: boolean
   }
   export type GenerateOptions = Omit<CompileOptions, "sourceMap"> & {
     sourceMap?: undefined | SourceMap
   }
-  export type SyncCompileOptions = CompileOptions &
-    { parseOptions?: { comptime?: false } }
 
   export type SourceMapping = [number] | [number, number, number, number]
 
@@ -74,7 +148,7 @@ declare module "@danielx/civet" {
   }
 
   // TODO: Import ParseError class from Hera
-  export type ParseError = {
+  export class ParseError {
     name: "ParseError"
     message: string // filename:line:column header\nbody
     header: string
@@ -84,7 +158,8 @@ declare module "@danielx/civet" {
     column: number | string
     offset: number
   }
-  export type ParseErrors = {
+  export class ParseErrors {
+    constructor(errors: ParseError[])
     name: "ParseErrors"
     message: string
     errors: ParseError[]
@@ -97,7 +172,7 @@ declare module "@danielx/civet" {
       code: string,
       sourceMap: SourceMap,
     } : string
-  export function compile<const T extends CompileOptions>(source: string, options?: T):
+  export function compile<const T extends CompileOptions>(source: string | Buffer, options?: T):
     T extends { sync: true } ? CompileOutput<T> : Promise<CompileOutput<T>>
   /** Warning: No caching */
   export function parse(source: string, options?: CompileOptions & {startRule?: string}): CivetAST
@@ -105,6 +180,7 @@ declare module "@danielx/civet" {
   export function parseProgram<T extends CompileOptions>(source: string, options?: T):
     T extends { comptime: true } ? Promise<CivetAST> : CivetAST
   export function generate(ast: CivetAST, options?: GenerateOptions): string
+  export function decode(source: string | Buffer): string
 
   export const lib: {
     gatherRecursive(ast: CivetAST, predicate: (node: CivetAST) => boolean): CivetAST[]
@@ -117,6 +193,7 @@ declare module "@danielx/civet" {
     isCompileError: typeof isCompileError
     parse: typeof parse
     generate: typeof generate
+    decode: typeof decode
     SourceMap: typeof SourceMap
     ParseError: typeof ParseError
     ParseErrors: typeof ParseErrors
@@ -150,9 +227,10 @@ declare module "@danielx/civet/config" {
   export function loadConfig(
     path: string
   ): Promise<import("@danielx/civet").CompileOptions>
-  export default {
-    findInDir,
-    findConfig,
-    loadConfig,
+  const Config: {
+    findInDir: typeof findInDir,
+    findConfig: typeof findConfig,
+    loadConfig: typeof loadConfig,
   }
+  export default Config
 }

package/dist/unplugin/astro.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/astro.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
 var astro_civet_exports = {};
 __export(astro_civet_exports, {
   default: () => astro_civet_default

package/dist/unplugin/astro.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/astro.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
 import civetUnplugin, {} from "./unplugin.mjs";
 var astro_civet_default = function(opts = {}) {
   return {

package/dist/unplugin/esbuild.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/esbuild.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
 var esbuild_civet_exports = {};
 __export(esbuild_civet_exports, {
   default: () => esbuild_civet_default

package/dist/unplugin/esbuild.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/esbuild.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var esbuild_civet_default = civetUnplugin.esbuild;
 export {

package/dist/unplugin/farm.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/farm.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
 var farm_civet_exports = {};
 __export(farm_civet_exports, {
   default: () => farm_civet_default

package/dist/unplugin/farm.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/farm.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var farm_civet_default = civetUnplugin.farm;
 export {

package/dist/unplugin/rolldown.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rolldown.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
 var rolldown_civet_exports = {};
 __export(rolldown_civet_exports, {
   default: () => rolldown_civet_default

package/dist/unplugin/rolldown.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rolldown.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rolldown_civet_default = civetUnplugin.rolldown;
 export {

package/dist/unplugin/rollup.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rollup.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
 var rollup_civet_exports = {};
 __export(rollup_civet_exports, {
   default: () => rollup_civet_default

package/dist/unplugin/rollup.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rollup.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rollup_civet_default = civetUnplugin.rollup;
 export {

package/dist/unplugin/rspack.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rspack.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
 var rspack_civet_exports = {};
 __export(rspack_civet_exports, {
   default: () => rspack_civet_default

package/dist/unplugin/rspack.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/rspack.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rspack_civet_default = civetUnplugin.rspack;
 export {

package/dist/unplugin/unplugin.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var unplugin_civet_exports = {};
 __export(unplugin_civet_exports, {
   default: () => unplugin_civet_default,
@@ -46,7 +46,7 @@ var import_os = __toESM(require("os"));
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
@@ -265,9 +265,7 @@ var rawPlugin = (options = {}, meta) => {
           if (!filename.endsWith(".civet.tsx")) return systemReadFile(filename, encoding);
           if (fsMap.has(filename)) return fsMap.get(filename);
           const civetFilename = filename.slice(0, -4);
-          const rawCivetSource = fs.readFileSync(civetFilename, {
-            encoding
-          });
+          const rawCivetSource = fs.readFileSync(civetFilename, { encoding });
           const { code: compiledTS, sourceMap } = import_civet.default.compile(rawCivetSource, {
             ...tsCompileOptions,
             filename,
@@ -342,7 +340,7 @@ var rawPlugin = (options = {}, meta) => {
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
-            console.log("WARNING: Civet unplugin's `emitDeclaration` requires esbuild's `outdir` option to be set;");
+            throw new Error("Civet unplugin's `emitDeclaration` requires esbuild's `outdir` option to be set;");
           }
           for (const file of fsMap.keys()) {
             const slashed = slash(file);
@@ -465,7 +463,7 @@ var rawPlugin = (options = {}, meta) => {
           filename: id,
           errors: []
         };
-        const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
+        const rawCivetSource = (0, import_civet.decode)(await fs.promises.readFile(filename));
         const ast = await import_civet.default.compile(rawCivetSource, {
           ...civetOptions,
           ast: true
@@ -539,7 +537,7 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
-          import_path.default.relative(rootDir, id.replace(/\.[jt]sx$/, "")),
+          import_path.default.relative(rootDir, extractCivetFilename(id, outExt).filename),
           import_path.default.relative(rootDir, id)
         ));
         let transformed = {

package/dist/unplugin/unplugin.mjs

@@ -1,6 +1,6 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 import { createUnplugin } from "unplugin";
-import civet, { lib, SourceMap } from "@danielx/civet";
+import civet, { decode, lib, SourceMap } from "@danielx/civet";
 import { findInDir, loadConfig } from "@danielx/civet/config";
 import {
   remapRange,
@@ -14,7 +14,7 @@ import os from "os";
 // source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/unplugin.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
@@ -233,9 +233,7 @@ var rawPlugin = (options = {}, meta) => {
           if (!filename.endsWith(".civet.tsx")) return systemReadFile(filename, encoding);
           if (fsMap.has(filename)) return fsMap.get(filename);
           const civetFilename = filename.slice(0, -4);
-          const rawCivetSource = fs.readFileSync(civetFilename, {
-            encoding
-          });
+          const rawCivetSource = fs.readFileSync(civetFilename, { encoding });
           const { code: compiledTS, sourceMap } = civet.compile(rawCivetSource, {
             ...tsCompileOptions,
             filename,
@@ -310,7 +308,7 @@ var rawPlugin = (options = {}, meta) => {
         }
         if (options.emitDeclaration) {
           if (meta.framework === "esbuild" && !esbuildOptions.outdir) {
-            console.log("WARNING: Civet unplugin's `emitDeclaration` requires esbuild's `outdir` option to be set;");
+            throw new Error("Civet unplugin's `emitDeclaration` requires esbuild's `outdir` option to be set;");
           }
           for (const file of fsMap.keys()) {
             const slashed = slash(file);
@@ -433,7 +431,7 @@ var rawPlugin = (options = {}, meta) => {
           filename: id,
           errors: []
         };
-        const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
+        const rawCivetSource = decode(await fs.promises.readFile(filename));
         const ast = await civet.compile(rawCivetSource, {
           ...civetOptions,
           ast: true
@@ -507,7 +505,7 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
-          path.relative(rootDir, id.replace(/\.[jt]sx$/, "")),
+          path.relative(rootDir, extractCivetFilename(id, outExt).filename),
           path.relative(rootDir, id)
         ));
         let transformed = {

package/dist/unplugin/vite.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/vite.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
 var vite_civet_exports = {};
 __export(vite_civet_exports, {
   default: () => vite_civet_default

package/dist/unplugin/vite.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/vite.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\vite.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var vite_civet_default = civetUnplugin.vite;
 export {

package/dist/unplugin/webpack.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/webpack.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
 var webpack_civet_exports = {};
 __export(webpack_civet_exports, {
   default: () => webpack_civet_default

package/dist/unplugin/webpack.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:/home/daniel/apps/Civet/source/unplugin/webpack.civet.jsx
+// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\webpack.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var webpack_civet_default = civetUnplugin.webpack;
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -112,7 +112,7 @@
   },
   "devDependencies": {
     "@danielx/civet": "0.9.4",
-    "@danielx/hera": "^0.8.16",
+    "@danielx/hera": "^0.8.17",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.8",

package/register.js

@@ -58,7 +58,7 @@ const { compile } = require("./");
 // Old-style CJS registration
 if (require.extensions) {
   require.extensions[".civet"] = function (module, filename) {
-    const js = compile(fs.readFileSync(filename, 'utf8'), {
+    const js = compile(fs.readFileSync(filename), {
       filename,
       js: true,
       inlineMap: true,
@@ -83,7 +83,7 @@ function retrieveFile(path) {
   }
 
   if (!outputCache.has(path)) {
-    outputCache.set(path, compile(fs.readFileSync(path, 'utf8'), {
+    outputCache.set(path, compile(fs.readFileSync(path), {
       filename: path,
       js: true,
       inlineMap: true,