@danielx/civet 0.7.13 → 0.7.15

package/dist/astro.js

@@ -100,6 +100,8 @@ var rawPlugin = (options = {}, meta) => {
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
+  let configErrors;
+  let configFileNames;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
   const getFormatHost = (sys) => {
     return {
@@ -114,6 +116,16 @@ var rawPlugin = (options = {}, meta) => {
     enforce: "pre",
     async buildStart() {
       if (transformTS || options.ts === "tsc") {
+        let mogrify2 = function(key) {
+          if (key in config && Array.isArray(config[key])) {
+            config[key] = config[key].map((item) => {
+              if (typeof item !== "string")
+                return item;
+              return item.replace(/\.civet\b(?!\.)/g, ".civet.tsx");
+            });
+          }
+        };
+        var mogrify = mogrify2;
         const ts = await tsPromise;
         const civetConfigPath = "config" in options ? options.config : await (0, import_config.findInDir)(process.cwd());
         if (civetConfigPath) {
@@ -135,17 +147,26 @@ var rawPlugin = (options = {}, meta) => {
           console.error(ts.formatDiagnostic(error, getFormatHost(ts.sys)));
           throw error;
         }
+        mogrify2("files");
+        const system = { ...ts.sys };
+        const { readDirectory: systemReadDirectory } = system;
+        system.readDirectory = (path2, extensions, excludes, includes, depth) => {
+          extensions = [...extensions ?? [], ".civet"];
+          return systemReadDirectory(path2, extensions, excludes, includes, depth).map((name) => name.endsWith(".civet") ? name + ".tsx" : name);
+        };
         const configContents = ts.parseJsonConfigFileContent(
           config,
-          ts.sys,
+          system,
           process.cwd()
         );
+        configErrors = configContents.errors;
+        configFileNames = configContents.fileNames;
         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
@@ -153,11 +174,15 @@ var rawPlugin = (options = {}, meta) => {
         fsMap = /* @__PURE__ */ new Map();
       }
     },
-    async buildEnd() {
+    async buildEnd(useConfigFileNames = false) {
       if (transformTS) {
         const ts = await tsPromise;
         const system = tsvfs.createFSBackedSystem(fsMap, process.cwd(), ts);
-        const { fileExists: systemFileExists, readFile: systemReadFile } = system;
+        const {
+          fileExists: systemFileExists,
+          readFile: systemReadFile,
+          readDirectory: systemReadDirectory
+        } = system;
         system.fileExists = (filename) => {
           if (!filename.endsWith(".civet.tsx"))
             return systemFileExists(filename);
@@ -165,9 +190,35 @@ var rawPlugin = (options = {}, meta) => {
             return true;
           return systemFileExists(filename.slice(0, -4));
         };
+        system.readDirectory = (path2) => systemReadDirectory(path2).map((name) => name.endsWith(".civet") ? name + ".tsx" : name);
         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, encoding);
+            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);
+            return systemReadFile(filename, encoding);
           if (fsMap.has(filename))
             return fsMap.get(filename);
           const civetFilename = filename.slice(0, -4);
@@ -189,8 +240,9 @@ var rawPlugin = (options = {}, meta) => {
           compilerOptions,
           ts
         );
+        host.compilerHost.getDirectories = system.getDirectories;
         const program = ts.createProgram({
-          rootNames: [...fsMap.keys()],
+          rootNames: useConfigFileNames ? configFileNames : [...fsMap.keys()],
           options: compilerOptions,
           host: host.compilerHost
         });
@@ -216,6 +268,9 @@ var rawPlugin = (options = {}, meta) => {
             start: range.start
           };
         });
+        if (configErrors?.length) {
+          diagnostics.unshift(...configErrors);
+        }
         if (diagnostics.length > 0) {
           console.error(
             ts.formatDiagnosticsWithColorAndContext(