@danielx/civet 0.7.8 → 0.7.10

package/dist/civet

@@ -46,11 +46,11 @@ var unplugin;
 function version() {
   return require("../package.json").version;
 }
-if (process.argv.includes("--version")) {
+if (process.argv.some((a) => a === "--version" || a === "-version" || a === "-v")) {
   console.log(version());
   process.exit(0);
 }
-if (process.argv.includes("--help")) {
+if (process.argv.some((a1) => a1 === "--help" || a1 === "-help" || a1 === "-h")) {
   process.stderr.write(`       \u2584\u2584\xB7 \u25AA   \u258C \u2590\xB7\u2584\u2584\u2584 .\u2584\u2584\u2584\u2584\u2584
       \u2590\u2588 \u258C\u25AA\u2588\u2588 \u25AA\u2588\xB7\u2588\u258C\u2580\u2584.\u2580\xB7\u2022\u2588\u2588       _._     _,-'""\`-._
       \u2588\u2588 \u2584\u2584\u2590\u2588\xB7\u2590\u2588\u2590\u2588\u2022\u2590\u2580\u2580\u25AA\u2584 \u2590\u2588.\u25AA    (,-.\`._,'(       |\\\`-/|
@@ -106,6 +106,7 @@ function parseArgs(args) {
   const filenames = [];
   let scriptArgs = [];
   let i = 0;
+  let errors = 0;
   function endOfArgs(j) {
     i = args.length;
     if (j >= args.length) {
@@ -199,9 +200,9 @@ function parseArgs(args) {
       }
       default: {
         if (arg.startsWith("-") && arg !== "-") {
-          throw new Error(`Invalid command-line argument ${arg}`);
-        }
-        if (options.run) {
+          console.error(`Invalid command-line argument: ${arg}`);
+          errors++;
+        } else if (options.run) {
           endOfArgs(i);
         } else {
           filenames.push(arg);
@@ -210,6 +211,9 @@ function parseArgs(args) {
     }
     i++;
   }
+  if (errors) {
+    process.exit(Math.min(255, errors));
+  }
   return { filenames, scriptArgs, options };
 }
 async function* readFiles(filenames) {
@@ -273,7 +277,6 @@ async function repl(options) {
       };
     } else {
       const execArgv = ["--experimental-vm-modules"];
-      const { register } = await import("node:module");
       if (process.env.NODE_OPTIONS) {
         execArgv.push(process.env.NODE_OPTIONS);
       }
@@ -343,17 +346,36 @@ async function repl(options) {
       } else if (input in ["quit\n", "exit\n", "quit()\n", "exit()\n"]) {
         return process.exit(0);
       } else if (input.endsWith("\n\n")) {
+        let showError2 = function(error) {
+          console.error("Error while parsing Civet code:");
+          if ((0, import_main.isCompileError)(error)) {
+            if (error.errors != null) {
+              error = error.errors[0];
+            }
+            return console.log(`${input.split("\n").slice(0, error.line).join("\n")}
+${" ".repeat(error.column - 1)}^ ${error.header}`);
+          } else {
+            return console.error(error);
+          }
+        };
+        var showError = showError2;
         let output;
         if (options.compile || options.ast) {
           try {
             output = await (0, import_main.compile)(input, { ...options, filename });
           } catch (error) {
-            console.error(error);
+            showError2(error);
             return callback(null, void 0);
           }
           return callback(null, output);
         }
-        let ast = await (0, import_main.compile)(input, { ...options, filename, ast: true });
+        let ast;
+        try {
+          ast = await (0, import_main.compile)(input, { ...options, filename, ast: true });
+        } catch (error) {
+          showError2(error);
+          return callback(null, void 0);
+        }
         const topLevelAwait = import_main.lib.hasAwait(ast) || import_main.lib.hasImportDeclaration(ast);
         if (topLevelAwait) {
           const [prologue, rest] = (0, import_main.parse)(input, { startRule: "ProloguePrefix" });
@@ -373,7 +395,7 @@ async function repl(options) {
             });
           });
         }
-        const errors = [];
+        let errors = [];
         try {
           output = (0, import_main.generate)(ast, { errors });
         } catch (error) {
@@ -381,7 +403,9 @@ async function repl(options) {
           return callback(null, void 0);
         }
         if (errors.length) {
-          console.error(`Parse errors: ${errors.map(($2) => $2.message).join("\n")}`);
+          errors = [];
+          (0, import_main.generate)(ast, { errors, sourceMap: (0, import_main.SourceMap)(input) });
+          showError2(errors[0]);
           return callback(null, void 0);
         }
         let result;
@@ -531,7 +555,7 @@ async function cli() {
           targetPath = outputPath;
         }
         if (targetPath.dir) {
-          import_promises.default.mkdir(targetPath.dir, { recursive: true });
+          await import_promises.default.mkdir(targetPath.dir, { recursive: true });
         }
         const targetFilename = import_path.default.format(targetPath);
         try {

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/esm.mjs

@@ -3,8 +3,7 @@ import { readFileSync } from "fs";
 import { pathToFileURL, fileURLToPath } from "url";
 import sourceMapSupport from "@cspotcode/source-map-support";
 import Civet from "./main.js";
-var { compile, util } = Civet;
-var { SourceMap } = util;
+var { compile, SourceMap } = Civet;
 var baseURL = pathToFileURL(process.cwd() + "/").href;
 var extensionsRegex = /\.civet$/;
 var registered = false;