@danielx/civet 0.11.1 → 0.11.3

package/dist/civet

@@ -33,6 +33,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var cli_civet_exports = {};
 __export(cli_civet_exports, {
   cli: () => cli,
+  makeOutputFilename: () => makeOutputFilename,
   parseArgs: () => parseArgs,
   repl: () => repl,
   version: () => version
@@ -287,6 +288,22 @@ async function* readFiles(filenames, evalString) {
     }
   }
 }
+function makeOutputFilename(filename, options) {
+  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);
+  return import_node_path.default.format(outputPath);
+}
 async function repl(args, options) {
   const vm = await import("node:vm");
   let importModuleDynamically = vm.constants?.USE_MAIN_CONTEXT_DEFAULT_LOADER;
@@ -326,20 +343,24 @@ async function repl(args, options) {
   })()} code.`);
   global.quit = global.exit = () => process.exit(0);
   const nodeRepl = await import("node:repl");
+  let ref2;
+  switch (false) {
+    case !options.ast: {
+      ref2 = "\u{1F332}> ";
+      break;
+    }
+    case !options.compile: {
+      ref2 = "\u{1F408}> ";
+      break;
+    }
+    default: {
+      ref2 = "\u{1F431}> ";
+    }
+  }
+  ;
+  const prompt = ref2;
   const r = nodeRepl.start({
-    prompt: (() => {
-      switch (false) {
-        case !options.ast: {
-          return "\u{1F332}> ";
-        }
-        case !options.compile: {
-          return "\u{1F408}> ";
-        }
-        default: {
-          return "\u{1F431}> ";
-        }
-      }
-    })(),
+    prompt,
     writer: (() => {
       if (options.ast) {
         return (obj) => {
@@ -444,7 +465,32 @@ ${" ".repeat(error.column - 1)}^ ${error.header}`);
       }
     }
   });
-  return r;
+  const bufferedCommandSymbol = Object.getOwnPropertySymbols(r).find((symbol) => {
+    return symbol.description === "bufferedCommand";
+  });
+  const interfaceSetPrompt = Object.getPrototypeOf(Object.getPrototypeOf(r))?.setPrompt;
+  const writeToOutputSymbol = Object.getOwnPropertySymbols(Object.getPrototypeOf(Object.getPrototypeOf(r))).find((symbol) => {
+    return symbol.description === "_writeToOutput";
+  });
+  if (bufferedCommandSymbol && interfaceSetPrompt && writeToOutputSymbol) {
+    const originalWriteToOutput = r[writeToOutputSymbol];
+    Object.defineProperty(r, writeToOutputSymbol, {
+      value: (text) => {
+        return originalWriteToOutput.call(r, text.replace(/(^|\n)\| /g, "$1... "));
+      },
+      configurable: true,
+      writable: true
+    });
+    return r.displayPrompt = (preserveCursor) => {
+      interfaceSetPrompt.call(
+        r,
+        r[bufferedCommandSymbol]?.length ? "... " : prompt
+      );
+      return r.prompt(preserveCursor);
+    };
+  }
+  ;
+  return;
 }
 async function cli(args = process.argv.slice(2)) {
   let { filenames, scriptArgs, options } = await parseArgs(args);
@@ -516,6 +562,28 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
     }
   }
   if (options.typescript) {
+    if (!import_meta.url) {
+      try {
+        require("typescript");
+      } catch {
+        const modulePkg = require("node:module");
+        let ref3;
+        if (ref3 = __dirname.match(/([/\\]@danielx)?[/\\][cC]ivet[/\\]dist[/\\]?$/)) {
+          const match = ref3;
+          if (match[1]) {
+            modulePkg.globalPaths?.push(import_node_path.default.join(__dirname, "..", "..", ".."));
+          } else {
+            modulePkg.globalPaths?.push(import_node_path.default.join(__dirname, "..", ".."));
+          }
+        }
+        try {
+          require("typescript");
+        } catch {
+          console.error("Civet could not find TypeScript, which is required for --typecheck or --emit-declaration. Please install typescript using the same package manager you used to install @danielx/civet. With NPM for example: `npm install typescript` if you are local to a project, or `npm install -g typescript` if you installed Civet globally.");
+          process.exit(1);
+        }
+      }
+    }
     const unpluginOptions = {
       ...options,
       ts: options.js ? "civet" : "preserve",
@@ -549,6 +617,7 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
       errors++;
       continue;
     }
+    const outputFilename = makeOutputFilename(filename, options);
     let output;
     try {
       if (unplugin != null) {
@@ -558,7 +627,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 +640,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;
-        }
-        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 outputDir = import_node_path.default.dirname(outputFilename);
+        if (!(outputDir === ".")) {
+          await import_promises.default.mkdir(outputDir, { 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 ref4;
       {
         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);
+          ref4 = import_main.lib.hasAwait(ast) || import_main.lib.hasImportDeclaration(ast) || import_main.lib.hasExportDeclaration(ast);
         } else {
-          ref1 = void 0;
+          ref4 = void 0;
         }
       }
       ;
-      const esm = ref1;
+      const esm = ref4;
       if (esm) {
         if (stdin) {
           filename = `.stdin-${process.pid}.civet`;
@@ -690,9 +743,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 ref5;
+      if (ref5 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
+        const match = ref5;
         return process.exitCode = Math.min(255, errors + +match[1]);
       } else {
         process.exitCode = 1;
@@ -706,6 +759,7 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cli,
+  makeOutputFilename,
   parseArgs,
   repl,
   version

package/dist/config.js

@@ -71,6 +71,9 @@ async function findInDir(dirPath) {
     const configName = configNames[i];
     for (let i1 = 0, len1 = configExtensions.length; i1 < len1; i1++) {
       const extension = configExtensions[i1];
+      if (configName === "package" && (extension === ".civet" || extension === ".js")) {
+        continue;
+      }
       for (let ref = ["." + configName + extension, configName + extension], i2 = 0, len2 = ref.length; i2 < len2; i2++) {
         const entry = ref[i2];
         if (entries.has(entry) && await (async () => {

package/dist/config.mjs

@@ -35,6 +35,9 @@ async function findInDir(dirPath) {
     const configName = configNames[i];
     for (let i1 = 0, len1 = configExtensions.length; i1 < len1; i1++) {
       const extension = configExtensions[i1];
+      if (configName === "package" && (extension === ".civet" || extension === ".js")) {
+        continue;
+      }
       for (let ref = ["." + configName + extension, configName + extension], i2 = 0, len2 = ref.length; i2 < len2; i2++) {
         const entry = ref[i2];
         if (entries.has(entry) && await (async () => {