@danielx/civet 0.7.1 → 0.7.2

package/dist/civet

@@ -78,6 +78,7 @@ Options:
   -c / --compile   Compile input files to TypeScript (or JavaScript)
   --config XX      Specify a config file (default scans for a config.civet, civet.json, civetconfig.civet or civetconfig.json file, optionally in a .config directory, or starting with a .)
   --civet XX       Specify civet compiler flag, as in "civet XX" prologue
+  --comptime       Enable execution of code during compilation via comptime
   --no-config      Don't scan for a config file
   --js             Strip out all type annotations; default to .jsx extension
   --ast            Print the AST instead of the compiled code
@@ -120,14 +121,7 @@ function parseArgs(args) {
   while (i < args.length) {
     const arg = args[i];
     if (/^-\w{2,}$/.test(arg)) {
-      args.splice(i, 1 + i - i, ...(() => {
-        const results = [];
-        for (let ref = arg.slice(1), i1 = 0, len = ref.length; i1 < len; i1++) {
-          const char = ref[i1];
-          results.push(`-${char}`);
-        }
-        return results;
-      })());
+      args.splice(i, 1 + i - i, ...results);
       continue;
     }
     switch (arg) {
@@ -158,6 +152,14 @@ function parseArgs(args) {
         );
         break;
       }
+      case "--comptime": {
+        (options.parseOptions ??= {}).comptime = true;
+        break;
+      }
+      case "--no-comptime": {
+        (options.parseOptions ??= {}).comptime = false;
+        break;
+      }
       case "--ast": {
         options.ast = true;
         break;
@@ -212,8 +214,8 @@ function parseArgs(args) {
 }
 async function* readFiles(filenames) {
   const results1 = [];
-  for (let i2 = 0, len1 = filenames.length; i2 < len1; i2++) {
-    let filename = filenames[i2];
+  for (let i1 = 0, len = filenames.length; i1 < len; i1++) {
+    let filename = filenames[i1];
     const stdin = filename === "-";
     try {
       let content;
@@ -313,20 +315,28 @@ async function repl(options) {
         }
       }
     })(),
-    writer: options.ast ? (obj) => {
-      try {
-        return JSON.stringify(obj, null, 2);
-      } catch (e) {
-        console.log(`Failed to stringify: ${e}`);
-        return "";
-      }
-    } : options.compile ? (obj) => {
-      if (typeof obj === "string") {
-        return obj?.replace(/\n*$/, "");
-      } else {
-        return "";
+    writer: (() => {
+      if (options.ast) {
+        return (obj) => {
+          try {
+            return JSON.stringify(obj, null, 2);
+          } catch (e) {
+            console.log(`Failed to stringify: ${e}`);
+            return "";
+          }
+        };
+      } else if (options.compile) {
+        return (obj) => {
+          if (typeof obj === "string") {
+            return obj?.replace(/\n*$/, "");
+          } else {
+            return "";
+          }
+        };
       }
-    } : void 0,
+      ;
+      return;
+    })(),
     eval: async function(input, context, filename, callback) {
       if (input === "\n") {
         return callback(null, void 0);
@@ -600,9 +610,9 @@ async function cli() {
         }
       });
     } catch (error) {
-      let ref1;
-      if (ref1 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
-        const match = ref1;
+      let ref;
+      if (ref = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
+        const match = ref;
         return process.exitCode = Math.min(255, errors + +match[1]);
       } else {
         process.exitCode = 1;

package/dist/config.js

@@ -44,21 +44,29 @@ var configFileNames = /* @__PURE__ */ new Set([
   "civetconfig.civet"
 ]);
 async function findInDir(dirPath) {
-  const dir = await import_promises.default.opendir(dirPath);
-  for await (const entry of dir) {
-    if (entry.isDirectory() && entry.name === ".config") {
-      const found = await findInDir(
-        import_path.default.join(dirPath, entry.name)
-      );
+  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();
+      } catch (e) {
+        return;
+      }
+    })()) {
+      const found = await findInDir(entryPath);
       if (found) {
         return found;
       }
     }
-    if (entry.isFile()) {
-      const name = entry.name.replace(/^\./, "");
-      if (configFileNames.has(name)) {
-        return import_path.default.join(dirPath, entry.name);
+    const name = entryName.replace(/^\./, "");
+    if (configFileNames.has(name) && await (async () => {
+      try {
+        return (await import_promises.default.stat(entryPath)).isFile();
+      } catch (e) {
+        return;
       }
+    })()) {
+      return entryPath;
     }
   }
   return;
@@ -78,21 +86,32 @@ async function findConfig(startDir) {
 }
 async function loadConfig(path2) {
   const config = await import_promises.default.readFile(path2, "utf8");
+  let data = {};
   if (path2.endsWith(".json")) {
-    return JSON.parse(config);
+    try {
+      data = JSON.parse(config);
+    } catch (e) {
+      throw new Error(`Error parsing JSON config file ${path2}: ${e}`);
+    }
   } else {
-    const js = (0, import_main.compile)(config, { js: true });
-    let exports2;
+    let js;
     try {
-      exports2 = await import(`data:text/javascript,${encodeURIComponent(js)}`);
+      js = (0, import_main.compile)(config, { js: true });
     } catch (e) {
-      console.error("Error loading config file", path2, e);
+      throw new Error(`Error compiling Civet config file ${path2}: ${e}`);
     }
-    if (typeof exports2.default !== "object" || exports2.default === null) {
-      throw new Error("civet config file must export an object");
+    try {
+      const exports2 = await import(`data:text/javascript,${encodeURIComponent(js)}`);
+      data = exports2?.default;
+    } catch (e) {
+      throw new Error(`Error running Civet config file ${path2}: ${e}`);
     }
-    return exports2.default;
   }
+  if (!(data != null && typeof data === "object" && !Array.isArray(data))) {
+    throw new Error(`Civet config file must export an object, not ${Array.isArray(data) ? "array" : data != null ? typeof data : "null"}`);
+  }
+  delete data?.parseOptions?.comptime;
+  return data;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esbuild-plugin.js

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(esbuild_plugin_exports);
 var import_promises = require("fs/promises");
 var import_path = __toESM(require("path"));
 var import_main = require("./main.js");
-function civet(options = {}) {
+var civet = function(options = {}) {
   const {
     filter = /\.civet$/,
     inlineMap = true,
@@ -124,7 +124,7 @@ function civet(options = {}) {
       });
     }
   };
-}
+};
 var defaultPlugin = civet();
 civet.setup = defaultPlugin.setup;
 var esbuild_plugin_default = civet;

package/dist/esbuild.js

@@ -165,7 +165,10 @@ var rawPlugin = (options = {}, meta) => {
           });
           const compiledTS = import_civet.default.compile(rawCivetSource, {
             filename,
-            js: false
+            js: false,
+            parseOptions: {
+              comptime: Boolean(options.comptime)
+            }
           });
           fsMap.set(filename, compiledTS);
           return compiledTS;
@@ -310,17 +313,22 @@ var rawPlugin = (options = {}, meta) => {
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
       let compiled;
+      const civetOptions = {
+        filename: id,
+        sourceMap: true,
+        parseOptions: {
+          comptime: Boolean(options.comptime)
+        }
+      };
       if (options.ts === "civet" && !transformTS) {
         compiled = import_civet.default.compile(rawCivetSource, {
-          filename: id,
-          js: true,
-          sourceMap: true
+          ...civetOptions,
+          js: true
         });
       } else {
         const compiledTS = import_civet.default.compile(rawCivetSource, {
-          filename: id,
-          js: false,
-          sourceMap: true
+          ...civetOptions,
+          js: false
         });
         const resolved = filename + outExt;
         sourceMaps.set(
@@ -365,9 +373,8 @@ var rawPlugin = (options = {}, meta) => {
           case "civet":
           default: {
             compiled = import_civet.default.compile(rawCivetSource, {
-              filename: id,
-              js: true,
-              sourceMap: true
+              ...civetOptions,
+              js: true
             });
             if (options.ts == void 0) {
               console.log(

package/dist/esm.mjs

@@ -14,7 +14,7 @@ var backslashRegExp = /\\/g;
 function normalizeSlashes(value) {
   return value.replace(backslashRegExp, directorySeparator);
 }
-function ensureRegister() {
+var ensureRegister = function() {
   if (registered) {
     return;
   }
@@ -34,7 +34,7 @@ function ensureRegister() {
   };
   sourceMapSupport.install(installation);
   return registered = true;
-}
+};
 function resolve(specifier, context, next) {
   const { parentURL = baseURL } = context;
   if (extensionsRegex.test(specifier)) {