@danielx/civet 0.6.70 → 0.6.72

package/dist/civet

@@ -62,6 +62,7 @@ Options:
   -o / --output XX Specify output directory and/or extension, or filename
   -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
   --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
@@ -70,6 +71,9 @@ Options:
 
 You can use - to read from stdin or (prefixed by -o) write to stdout.
 
+By default, .civet imports get rewritten to use the output extension.
+You can override this behavior via: --civet rewriteCivetImports=.ext
+
 `);
   process.exit(0);
 }
@@ -128,6 +132,15 @@ function parseArgs(args) {
         options.config = false;
         break;
       }
+      case "--civet": {
+        Object.assign(
+          options.parseOptions ??= {},
+          (0, import_main.parse)(`civet ${args[++i]}`, {
+            startRule: "CivetPrologueContent"
+          }).config
+        );
+        break;
+      }
       case "--ast": {
         options.ast = true;
         break;
@@ -320,6 +333,29 @@ async function cli() {
   if (options.repl) {
     return repl(options);
   }
+  let outputDir, outputExt, outputPath;
+  if (options.output) {
+    const optionsPath = import_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("/")) {
+      outputDir = options.output;
+    } else if (/^(\.[^.]+)+$/.test(optionsPath.base)) {
+      outputExt = optionsPath.base;
+      if (optionsPath.dir) {
+        outputDir = optionsPath.dir;
+      }
+    } else {
+      outputPath = optionsPath;
+    }
+    if (options.output !== "-") {
+      (options.parseOptions ??= {}).rewriteCivetImports ??= outputExt ?? ".civet" + (options.js ? ".jsx" : ".tsx");
+    }
+  }
   const results3 = [];
   for await (const { filename, error, content, stdin } of readFiles(filenames)) {
     if (error) {
@@ -340,40 +376,30 @@ async function cli() {
       if (stdin && !options.output || options.output === "-") {
         results3.push(process.stdout.write(output));
       } else {
-        let outputPath = import_path.default.parse(filename);
-        delete outputPath.base;
+        let targetPath = import_path.default.parse(filename);
+        delete targetPath.base;
         if (options.js) {
-          outputPath.ext += ".jsx";
+          targetPath.ext += ".jsx";
         } else {
-          outputPath.ext += ".tsx";
+          targetPath.ext += ".tsx";
         }
-        if (options.output) {
-          const optionsPath = import_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("/")) {
-            outputPath.dir = options.output;
-          } else if (/^(\.[^.]+)+$/.test(optionsPath.base)) {
-            outputPath.ext = optionsPath.base;
-            if (optionsPath.dir) {
-              outputPath.dir = optionsPath.dir;
-            }
-          } else {
-            outputPath = optionsPath;
-          }
+        if (outputDir != null) {
+          targetPath.dir = outputDir;
+        }
+        if (outputExt != null) {
+          targetPath.ext = outputExt;
+        }
+        if (outputPath != null) {
+          targetPath = outputPath;
         }
-        if (outputPath.dir) {
-          import_promises.default.mkdir(outputPath.dir, { recursive: true });
+        if (targetPath.dir) {
+          import_promises.default.mkdir(targetPath.dir, { recursive: true });
         }
-        const outputFilename = import_path.default.format(outputPath);
+        const targetFilename = import_path.default.format(targetPath);
         try {
-          results3.push(await import_promises.default.writeFile(outputFilename, output));
+          results3.push(await import_promises.default.writeFile(targetFilename, output));
         } catch (error2) {
-          console.error(`${outputFilename} failed to write:`);
+          console.error(`${targetFilename} failed to write:`);
           results3.push(console.error(error2));
         }
       }