@danielx/civet 0.11.1 → 0.11.2

package/dist/civet

@@ -549,6 +549,20 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
       errors++;
       continue;
     }
+    let ref1;
+    const outputPath = (delete (ref1 = options.outputPath ?? import_node_path.default.parse(filename)).base, // use name and ext
+    ref1.ext += // default extension
+    options.js ? ".jsx" : ".tsx", (($) => {
+      if (options.outputDir != null) {
+        $.dir = options.outputDir;
+      }
+      if (options.outputExt != null) {
+        return $.ext = options.outputExt;
+      }
+      ;
+      return;
+    })(ref1), ref1);
+    const outputFilename = import_node_path.default.format(outputPath);
     let output;
     try {
       if (unplugin != null) {
@@ -558,7 +572,7 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
           }
         }, `${filename}.tsx`)).code;
       } else {
-        output = await (0, import_main.compile)(content, { ...options, filename });
+        output = await (0, import_main.compile)(content, { ...options, filename, outputFilename });
       }
     } catch (error2) {
       console.error(error2);
@@ -571,46 +585,30 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
       if (stdin && !options.output || options.output === "-") {
         process.stdout.write(output);
       } else {
-        let targetPath = import_node_path.default.parse(filename);
-        delete targetPath.base;
-        if (options.js) {
-          targetPath.ext += ".jsx";
-        } else {
-          targetPath.ext += ".tsx";
-        }
-        if (options.outputDir != null) {
-          targetPath.dir = options.outputDir;
+        const outputDir = import_node_path.default.dirname(outputFilename);
+        if (!(outputDir === ".")) {
+          await import_promises.default.mkdir(outputDir, { recursive: true });
         }
-        if (options.outputExt != null) {
-          targetPath.ext = options.outputExt;
-        }
-        if (options.outputPath != null) {
-          targetPath = options.outputPath;
-        }
-        if (targetPath.dir) {
-          await import_promises.default.mkdir(targetPath.dir, { recursive: true });
-        }
-        const targetFilename = import_node_path.default.format(targetPath);
         try {
-          await import_promises.default.writeFile(targetFilename, output);
+          await import_promises.default.writeFile(outputFilename, output);
         } catch (error2) {
-          console.error(`${targetFilename} failed to write:`);
+          console.error(`${outputFilename} failed to write:`);
           console.error(error2);
           errors++;
         }
       }
     } else if (options.run) {
-      let ref1;
+      let ref2;
       {
         if (typeof output === "string" && /\b(await|import|export)\b/.test(output)) {
           const ast = await (0, import_main.compile)(content, { ...options, ast: true, filename });
-          ref1 = import_main.lib.hasAwait(ast) || import_main.lib.hasImportDeclaration(ast) || import_main.lib.hasExportDeclaration(ast);
+          ref2 = import_main.lib.hasAwait(ast) || import_main.lib.hasImportDeclaration(ast) || import_main.lib.hasExportDeclaration(ast);
         } else {
-          ref1 = void 0;
+          ref2 = void 0;
         }
       }
       ;
-      const esm = ref1;
+      const esm = ref2;
       if (esm) {
         if (stdin) {
           filename = `.stdin-${process.pid}.civet`;
@@ -690,9 +688,9 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
         }
       }, !filenames.length);
     } catch (error) {
-      let ref2;
-      if (ref2 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
-        const match = ref2;
+      let ref3;
+      if (ref3 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
+        const match = ref3;
         return process.exitCode = Math.min(255, errors + +match[1]);
       } else {
         process.exitCode = 1;