@danielx/civet 0.5.90 → 0.5.92

package/dist/civet

@@ -23,6 +23,7 @@ Usage:
     civet                                        # REPL for executing code
     civet -c                                     # REPL for transpiling code
     civet --ast                                  # REPL for parsing code
+    civet [options] input.civet                  # run input.civet
     civet [options] -c input.civet               # -> input.civet.tsx
     civet [options] -c input.civet -o .ts        # -> input.ts
     civet [options] -c input.civet -o dir        # -> dir/input.civet.tsx
@@ -48,7 +49,7 @@ You can use - to read from stdin or (prefixed by -o) write to stdout.
 encoding = "utf8";
 fs = require("fs/promises");
 path = require("path");
-parseArgs = function(args = process.argv.slice(2)) {
+parseArgs = function(args) {
   var arg, char, endOfArgs, filenames, i, options, ref, scriptArgs;
   options = {};
   Object.defineProperty(options, "run", {
@@ -250,8 +251,9 @@ repl = function(options) {
   });
 };
 cli = async function() {
-  var content, error, filename, filenames, options, optionsPath, output, outputFilename, outputPath, ref, results, scriptArgs, stat, stdin, x;
-  ({ filenames, scriptArgs, options } = parseArgs());
+  var argv, child, content, e, error, esm, filename, filenames, options, optionsPath, output, outputFilename, outputPath, ref, results, scriptArgs, stat, stdin, x;
+  argv = process.argv;
+  ({ filenames, scriptArgs, options } = parseArgs(argv.slice(2)));
   if (!filenames.length) {
     if (process.stdin.isTTY) {
       options.repl = true;
@@ -330,15 +332,42 @@ cli = async function() {
         }
       }
     } else {
-      module.filename = await fs.realpath(filename);
-      process.argv = ["civet", module.filename, ...scriptArgs];
-      module.paths = require("module")._nodeModulePaths(path.dirname(module.filename));
-      try {
-        results.push(module._compile(output, module.filename));
-      } catch (error1) {
-        error = error1;
-        console.error(`${filename} crashed while running:`);
-        results.push(console.error(error));
+      esm = /^\s*(import|export)\b/m.test(output);
+      if (esm) {
+        if (stdin) {
+          filename = `.stdin-${process.pid}.civet`;
+          try {
+            await fs.writeFile(filename, content, { encoding });
+          } catch (error1) {
+            e = error1;
+            console.error(`Could not write ${filename} for Civet ESM mode:`);
+            console.error(e);
+            process.exit(1);
+          }
+        }
+        child = require("child_process").spawnSync(argv[0], ["--loader", "@danielx/civet/esm", filename, ...scriptArgs], {
+          stdio: "inherit"
+        });
+        if (stdin) {
+          await fs.unlink(filename);
+        }
+        results.push(process.exit(child.status));
+      } else {
+        try {
+          module.filename = await fs.realpath(filename);
+        } catch (error1) {
+          module.filename = filename;
+        }
+        process.argv = ["civet", module.filename, ...scriptArgs];
+        module.paths = require("module")._nodeModulePaths(path.dirname(module.filename));
+        try {
+          results.push(module._compile(output, module.filename));
+        } catch (error1) {
+          error = error1;
+          console.error(`${filename} crashed while running in CJS mode:`);
+          console.error(error);
+          results.push(process.exit(1));
+        }
       }
     }
   }

package/dist/esm.mjs

@@ -23,7 +23,7 @@ const { SourceMap } = util
 const baseURL = pathToFileURL(process.cwd() + '/').href
 const extensionsRegex = /\.civet$/
 
-let registered = false
+let registered = false;
 const outputCache = new Map
 
 const directorySeparator = '/'
@@ -82,6 +82,7 @@ export async function load(url, context, next) {
     const {code: tsSource, sourceMap} = compile(source, {
       filename: path,
       sourceMap: true,
+      js: true,
     })
 
     const transpiledPath = url + ".tsx"