@danielx/civet 0.6.88 → 0.6.90

package/dist/civet

@@ -344,11 +344,7 @@ async function repl(options) {
           return callback(null, output);
         }
         let ast = (0, import_main.compile)(input, { ...options, filename, ast: true });
-        const topLevelAwait = import_main.lib.gatherRecursive(
-          ast,
-          ($) => $.type === "Await",
-          import_main.lib.isFunction
-        ).length > 0;
+        const topLevelAwait = import_main.lib.hasAwait(ast) || import_main.lib.hasImportDeclaration(ast);
         if (topLevelAwait) {
           const [prologue, rest] = (0, import_main.parse)(input, { startRule: "ProloguePrefix" });
           const prefix = input.slice(0, -rest.length);
@@ -357,6 +353,15 @@ async function repl(options) {
             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();
+              if (!Array.isArray(ast)) {
+                ast = [ast];
+              }
+              return ast.unshift(`var ${decl.names.join(",")};`);
+            });
+          });
         }
         const errors = [];
         try {
@@ -366,7 +371,7 @@ async function repl(options) {
           return callback(null, void 0);
         }
         if (errors.length) {
-          console.error(`Parse errors: ${errors.map(($1) => $1.message).join("\n")}`);
+          console.error(`Parse errors: ${errors.map(($2) => $2.message).join("\n")}`);
           return callback(null, void 0);
         }
         let result;
@@ -379,12 +384,18 @@ async function repl(options) {
           return callback(error, void 0);
         }
         if (topLevelAwait) {
+          let threw = false;
           try {
             result = await result;
           } catch (error) {
+            threw = true;
             callback(error, void 0);
           }
-          return callback(null, result);
+          if (!threw) {
+            return callback(null, result);
+          }
+          ;
+          return;
         } else {
           return callback(null, result);
         }