@danielx/civet 0.7.36 → 0.8.1

package/dist/civet

@@ -419,26 +419,35 @@ ${" ".repeat(error.column - 1)}^ ${error.header}`);
             prefix + (coffee ? "(do ->\n" : "async do\n") + rest.replace(/^/gm, " ") + (coffee ? ")" : ""),
             { ...options, filename, ast: true }
           );
-          import_main.lib.gatherRecursive(ast, ($) => $.type === "BlockStatement").forEach((topBlock) => {
-            return import_main.lib.gatherRecursiveWithinFunction(topBlock, ($1) => $1.type === "Declaration").forEach((decl) => {
-              const type = decl.children.shift();
+          let ref1;
+          if (coffee) {
+            ref1 = import_main.lib.gatherRecursive(ast.children, ($) => $.type === "BlockStatement")[0];
+          } else {
+            ref1 = import_main.lib.gatherRecursive(ast.children, ($1) => $1.type === "DoStatement")[0].block;
+          }
+          ;
+          const topBlock = ref1;
+          for (let ref2 = topBlock.expressions, i3 = 0, len2 = ref2.length; i3 < len2; i3++) {
+            const [, statement] = ref2[i3];
+            if (typeof statement === "object" && statement != null && "type" in statement && statement.type === "Declaration") {
+              statement.children.shift();
               if (!Array.isArray(ast)) {
                 ast = [ast];
               }
-              return ast.unshift(`var ${decl.names.join(",")};`);
-            });
-          });
+              ast.unshift(`var ${statement.names.join(",")};`);
+            }
+          }
         }
         let errors = [];
         try {
-          output = (0, import_main.generate)(ast, { errors });
+          output = (0, import_main.generate)(ast, { ...options, errors, sourceMap: void 0 });
         } catch (error) {
           console.error(error);
           return callback(null, void 0);
         }
         if (errors.length) {
           errors = [];
-          (0, import_main.generate)(ast, { errors, sourceMap: (0, import_main.SourceMap)(input) });
+          (0, import_main.generate)(ast, { ...options, errors, sourceMap: (0, import_main.SourceMap)(input) });
           showError2(errors[0]);
           return callback(null, void 0);
         }
@@ -546,7 +555,8 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
     const unpluginOptions = {
       ...options,
       ts: options.js ? "civet" : "preserve",
-      outputExtension: ".tsx"
+      outputExtension: ".tsx",
+      declarationExtension: options.outputExt?.replace(/\.[jt]sx?$/i, ".d.ts")
     };
     (unpluginOptions.parseOptions ??= {}).rewriteCivetImports = ".civet.jsx";
     unplugin = (0, import_unplugin.rawPlugin)(unpluginOptions, { framework: "civet-cli" });
@@ -559,8 +569,16 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
   if (options.repl) {
     return repl(args, options);
   }
+  process.stdout.on("error", (e) => {
+    if (["EPIPE", "EOF"].includes(e.code)) {
+      return process.exit(0);
+    } else {
+      console.error(e);
+      return process.exit(1);
+    }
+  });
   let errors = 0;
-  for await (const { filename, error, content, stdin } of readFiles(filenames, options.eval)) {
+  for await (let { filename, error, content, stdin } of readFiles(filenames, options.eval)) {
     if (error) {
       console.error(`${filename} failed to load:`);
       console.error(error);
@@ -583,14 +601,6 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
       errors++;
       continue;
     }
-    process.stdout.on("error", (e) => {
-      if (["EPIPE", "EOF"].includes(e.code)) {
-        return process.exit(0);
-      } else {
-        console.error(e);
-        return process.exit(1);
-      }
-    });
     if (options.ast) {
       process.stdout.write(JSON.stringify(output, null, 2));
     } else if (options.compile) {
@@ -626,14 +636,24 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
         }
       }
     } else if (options.run) {
-      const esm = /^\s*(import|export)\b/m.test(output);
+      let ref3;
+      {
+        if (typeof output === "string" && /\b(await|import|export)\b/.test(output)) {
+          const ast = await (0, import_main.compile)(content, { ...options, ast: true, filename });
+          ref3 = import_main.lib.hasAwait(ast) || import_main.lib.hasImportDeclaration(ast) || import_main.lib.hasExportDeclaration(ast);
+        } else {
+          ref3 = void 0;
+        }
+      }
+      ;
+      const esm = ref3;
       if (esm) {
         if (stdin) {
-          const filename2 = `.stdin-${process.pid}.civet`;
+          filename = `.stdin-${process.pid}.civet`;
           try {
-            await import_promises.default.writeFile(filename2, content, { encoding });
+            await import_promises.default.writeFile(filename, content, { encoding });
           } catch (e) {
-            console.error(`Could not write ${filename2} for Civet ESM mode:`);
+            console.error(`Could not write ${filename} for Civet ESM mode:`);
             console.error(e);
             process.exit(1);
           }
@@ -706,9 +726,9 @@ You can override this behavior via: --civet rewriteCivetImports=.ext
         }
       }, !filenames.length);
     } catch (error) {
-      let ref1;
-      if (ref1 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
-        const match = ref1;
+      let ref4;
+      if (ref4 = error.message.match(/Aborting build because of (\d+) TypeScript diagnostic/)) {
+        const match = ref4;
         return process.exitCode = Math.min(255, errors + +match[1]);
       } else {
         process.exitCode = 1;