@danielx/civet 0.7.12 → 0.7.14

package/dist/bun-civet.mjs

@@ -1,12 +1,11 @@
-import { plugin } from "bun";
+import { plugin, file } from "bun";
 await plugin({
   name: "Civet loader",
-  setup: async function(builder) {
+  async setup(builder) {
     const { compile } = await import("./main.mjs");
-    const { readFile } = await import("node:fs/promises");
-    return builder.onLoad({ filter: /\.civet$/ }, async function({ path }) {
-      const source = await readFile(path, "utf8");
-      const contents = await compile(source, { comptime: true });
+    return builder.onLoad({ filter: /\.civet$/ }, async ({ path }) => {
+      const source = await file(path).text();
+      let contents = await compile(source, { comptime: true });
       return {
         contents,
         loader: "tsx"

package/dist/civet

@@ -40,8 +40,8 @@ module.exports = __toCommonJS(cli_exports);
 var import_main = require("./main.js");
 var import_config = require("./config.js");
 var import_unplugin = require("./unplugin");
-var import_promises = __toESM(require("fs/promises"));
-var import_path = __toESM(require("path"));
+var import_promises = __toESM(require("node:fs/promises"));
+var import_node_path = __toESM(require("node:path"));
 var unplugin;
 function version() {
   return require("../package.json").version;
@@ -276,7 +276,7 @@ async function repl(options) {
       const { pathToFileURL } = await import("node:url");
       importModuleDynamically = (specifier) => {
         if (/^\.\.?[/\\]/.test(specifier)) {
-          return import(pathToFileURL(import_path.default.join(process.cwd(), specifier)));
+          return import(pathToFileURL(import_node_path.default.join(process.cwd(), specifier)));
         } else {
           return import(specifier);
         }
@@ -471,7 +471,7 @@ async function cli() {
       ts: options.js ? "civet" : "preserve",
       outputExtension: ".tsx"
     };
-    (unpluginOptions.parseOptions ??= {}).rewriteCivetImports = ".civet.tsx";
+    (unpluginOptions.parseOptions ??= {}).rewriteCivetImports = ".civet.jsx";
     unplugin = (0, import_unplugin.rawPlugin)(unpluginOptions, { framework: "civet-cli" });
     await unplugin.buildStart();
   }
@@ -484,14 +484,14 @@ async function cli() {
   }
   let outputDir, outputExt, outputPath;
   if (options.output) {
-    const optionsPath = import_path.default.parse(options.output);
+    const optionsPath = import_node_path.default.parse(options.output);
     let stat;
     try {
       stat = await import_promises.default.stat(options.output);
     } catch {
       stat = null;
     }
-    if (stat?.isDirectory() || options.output.endsWith(import_path.default.sep) || options.output.endsWith("/")) {
+    if (stat?.isDirectory() || options.output.endsWith(import_node_path.default.sep) || options.output.endsWith("/")) {
       outputDir = options.output;
     } else if (/^(\.[^.]+)+$/.test(optionsPath.base)) {
       outputExt = optionsPath.base;
@@ -543,7 +543,7 @@ async function cli() {
       if (stdin && !options.output || options.output === "-") {
         process.stdout.write(output);
       } else {
-        let targetPath = import_path.default.parse(filename);
+        let targetPath = import_node_path.default.parse(filename);
         delete targetPath.base;
         if (options.js) {
           targetPath.ext += ".jsx";
@@ -562,7 +562,7 @@ async function cli() {
         if (targetPath.dir) {
           await import_promises.default.mkdir(targetPath.dir, { recursive: true });
         }
-        const targetFilename = import_path.default.format(targetPath);
+        const targetFilename = import_node_path.default.format(targetPath);
         try {
           await import_promises.default.writeFile(targetFilename, output);
         } catch (error2) {
@@ -627,7 +627,7 @@ async function cli() {
           module.filename = filename;
         }
         process.argv = ["civet", module.filename, ...scriptArgs];
-        module.paths = require("module")._nodeModulePaths(import_path.default.dirname(module.filename));
+        module.paths = require("module")._nodeModulePaths(import_node_path.default.dirname(module.filename));
         try {
           module._compile(output, module.filename);
         } catch (error2) {

package/dist/config.js

@@ -44,7 +44,9 @@ var configFileNames = /* @__PURE__ */ new Set([
   "civetconfig.json",
   "civetconfig.civet",
   "civet.config.json",
-  "civet.config.civet"
+  "civet.config.civet",
+  "package.json",
+  "package.yaml"
 ]);
 async function findInDir(dirPath) {
   for (const entryName of await import_promises.default.readdir(dirPath)) {
@@ -92,10 +94,19 @@ async function loadConfig(path2) {
   let data = {};
   if (path2.endsWith(".json")) {
     try {
-      data = JSON.parse(config);
+      const json = JSON.parse(config);
+      data = json.civetConfig ?? json;
     } catch (e) {
       throw new Error(`Error parsing JSON config file ${path2}: ${e}`);
     }
+  } else if (/\.ya?ml$/.test(path2)) {
+    try {
+      const { default: YAML } = await import("yaml");
+      const yaml = YAML.parse(config);
+      data = yaml.civetConfig ?? yaml;
+    } catch (e) {
+      throw new Error(`Error parsing YAML config file ${path2}: ${e}`);
+    }
   } else {
     let js;
     try {

package/dist/esbuild.js

@@ -100,6 +100,7 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -140,12 +141,13 @@ var rawPlugin = (options = {}, meta) => {
           ts.sys,
           process.cwd()
         );
+        configErrors = configContents.errors;
         compilerOptions = {
           ...configContents.options,
           target: ts.ScriptTarget.ESNext,
           composite: false
         };
-        compilerOptions.jsx ?? (compilerOptions.jsx = "preserve");
+        compilerOptions.jsx ?? (compilerOptions.jsx = ts.JsxEmit.Preserve);
         compilerOptionsWithSourceMap = {
           ...compilerOptions,
           sourceMap: true
@@ -166,6 +168,31 @@ var rawPlugin = (options = {}, meta) => {
           return systemFileExists(filename.slice(0, -4));
         };
         system.readFile = (filename, encoding = "utf-8") => {
+          if (import_path.default.basename(filename) === "package.json") {
+            let recurse2 = function(node) {
+              if (node && typeof node === "object") {
+                for (const key in node) {
+                  const value = node[key];
+                  if (typeof value === "string") {
+                    if (value.endsWith(".civet")) {
+                      node[key] = value + ".tsx";
+                      modified = true;
+                    }
+                  } else if (value) {
+                    recurse2(value);
+                  }
+                }
+              }
+            };
+            var recurse = recurse2;
+            const json = systemReadFile(filename);
+            if (!json)
+              return json;
+            const parsed = JSON.parse(json);
+            let modified = false;
+            recurse2(parsed.imports);
+            return modified ? JSON.stringify(parsed) : json;
+          }
           if (!filename.endsWith(".civet.tsx"))
             return systemReadFile(filename);
           if (fsMap.has(filename))
@@ -216,6 +243,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(