@danielx/civet 0.6.73 → 0.6.75

package/dist/civet

@@ -26,8 +26,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // source/cli.civet
 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 unplugin;
 function version() {
   return require("../package.json").version;
 }
@@ -68,6 +70,8 @@ Options:
   --ast            Print the AST instead of the compiled code
   --inline-map     Generate a sourcemap
   --no-cache       Disable compiler caching (slow, for debugging)
+  --typecheck      Run TypeScript and output diagnostics
+  --emit-declaration  Run TypeScript and emit .d.ts files (if no errors)
 
 You can use - to read from stdin or (prefixed by -o) write to stdout.
 
@@ -82,7 +86,7 @@ function parseArgs(args) {
   const options = {};
   Object.defineProperty(options, "run", {
     get: function() {
-      return !(this.ast || this.compile);
+      return !(this.ast || this.compile || this.typecheck || this.emitDeclaration);
     }
   });
   const filenames = [];
@@ -165,6 +169,15 @@ function parseArgs(args) {
         options.trace = args[++i];
         break;
       }
+      case "--typecheck": {
+        options.typecheck = true;
+        break;
+      }
+      case "--emit-declaration":
+      case "--emitDeclaration": {
+        options.emitDeclaration = true;
+        break;
+      }
       case "--": {
         endOfArgs(++i);
         break;
@@ -326,6 +339,14 @@ async function cli() {
       filenames = ["-"];
     }
   }
+  if (options.typecheck || options.emitDeclaration) {
+    unplugin = (0, import_unplugin.rawPlugin)({
+      ...options,
+      ts: options.js ? "civet" : "preserve",
+      outputExtension: ".tsx"
+    }, { framework: "civet-cli" });
+    unplugin.buildStart();
+  }
   if (options.run) {
     options.js = true;
     options.inlineMap = true;
@@ -356,25 +377,35 @@ async function cli() {
       (options.parseOptions ??= {}).rewriteCivetImports ??= outputExt ?? ".civet" + (options.js ? ".jsx" : ".tsx");
     }
   }
-  const results3 = [];
+  let errors = 0;
   for await (const { filename, error, content, stdin } of readFiles(filenames)) {
     if (error) {
       console.error(`${filename} failed to load:`);
       console.error(error);
+      errors++;
       continue;
     }
     let output;
     try {
-      output = (0, import_main.compile)(content, { ...options, filename });
+      if (unplugin != null) {
+        output = (await unplugin.load.call({
+          addWatchFile() {
+            ;
+          }
+        }, `${filename}.tsx`)).code;
+      } else {
+        output = (0, import_main.compile)(content, { ...options, filename });
+      }
     } catch (error2) {
       console.error(error2);
+      errors++;
       continue;
     }
     if (options.ast) {
-      results3.push(process.stdout.write(JSON.stringify(output, null, 2)));
+      process.stdout.write(JSON.stringify(output, null, 2));
     } else if (options.compile) {
       if (stdin && !options.output || options.output === "-") {
-        results3.push(process.stdout.write(output));
+        process.stdout.write(output);
       } else {
         let targetPath = import_path.default.parse(filename);
         delete targetPath.base;
@@ -397,13 +428,14 @@ async function cli() {
         }
         const targetFilename = import_path.default.format(targetPath);
         try {
-          results3.push(await import_promises.default.writeFile(targetFilename, output));
+          await import_promises.default.writeFile(targetFilename, output);
         } catch (error2) {
           console.error(`${targetFilename} failed to write:`);
-          results3.push(console.error(error2));
+          console.error(error2);
+          errors++;
         }
       }
-    } else {
+    } else if (options.run) {
       const esm = /^\s*(import|export)\b/m.test(output);
       if (esm) {
         if (stdin) {
@@ -432,12 +464,12 @@ async function cli() {
           execArgv,
           stdio: "inherit"
         });
-        results3.push(child.on("exit", async (code) => {
+        child.on("exit", async (code) => {
           if (stdin) {
             await import_promises.default.unlink(filename);
           }
           return process.exit(code ?? 1);
-        }));
+        });
       } else {
         require("../register.js");
         try {
@@ -448,17 +480,36 @@ async function cli() {
         process.argv = ["civet", module.filename, ...scriptArgs];
         module.paths = require("module")._nodeModulePaths(import_path.default.dirname(module.filename));
         try {
-          results3.push(module._compile(output, module.filename));
+          module._compile(output, module.filename);
         } catch (error2) {
           console.error(`${filename} crashed while running in CJS mode:`);
           console.error(error2);
-          results3.push(process.exit(1));
+          process.exit(1);
         }
       }
     }
   }
+  process.exitCode = Math.min(255, errors);
+  if (unplugin != null) {
+    try {
+      return await unplugin.buildEnd.call({
+        emitFile({ source, fileName }) {
+          return import_promises.default.writeFile(fileName, source);
+        }
+      });
+    } catch (error) {
+      let ref1;
+      if (ref1 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
+        const match = ref1;
+        return process.exitCode = Math.min(255, errors + +match[1]);
+      } else {
+        process.exitCode = 1;
+        throw error;
+      }
+    }
+  }
   ;
-  return results3;
+  return;
 }
 if (require.main === module) {
   cli();

package/dist/esbuild.js

@@ -80,7 +80,7 @@ function implicitCivet(file) {
     return civet2;
   return;
 }
-var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) => {
+var rawPlugin = (options = {}, meta) => {
   if (options.dts)
     options.emitDeclaration = options.dts;
   if (options.js)
@@ -389,8 +389,8 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
       }
     }
   };
-});
-var src_default = civetUnplugin;
+};
+var src_default = (0, import_unplugin.createUnplugin)(rawPlugin);
 
 // src/esbuild.ts
 var esbuild_default = src_default.esbuild;