@danielx/civet 0.6.88 → 0.6.89

package/dist/browser.js

@@ -235,6 +235,9 @@ var Civet = (() => {
   function hasYield(exp) {
     return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Yield").length > 0;
   }
+  function hasImportDeclaration(exp) {
+    return gatherRecursiveWithinFunction(exp, ({ type }) => type === "ImportDeclaration").length > 0;
+  }
   function deepCopy(node) {
     if (node == null)
       return node;
@@ -396,9 +399,10 @@ var Civet = (() => {
     }
     return ["(", type, ")"];
   }
-  function wrapIIFE(expressions, async) {
+  function wrapIIFE(expressions, asyncFlag) {
     let prefix;
-    if (async) {
+    let async;
+    if (asyncFlag) {
       async = "async ";
     } else if (hasAwait(expressions)) {
       async = "async ";
@@ -586,16 +590,16 @@ var Civet = (() => {
         expressions,
         children: block.children === block.expressions ? expressions : block.children.map((c) => c === block.expressions ? expressions : c)
       };
-      if (block.bare) {
-        block.children = [[" {"], ...block.children, "}"];
-        block.bare = false;
-      }
+      braceBlock(block);
       updateParentPointers(block);
     }
     return block;
   }
   function braceBlock(block) {
     if (block.bare) {
+      if (block.children === block.expressions) {
+        block.children = [block.expressions];
+      }
       block.children.unshift(" {");
       block.children.push("}");
       return block.bare = false;
@@ -605,8 +609,13 @@ var Civet = (() => {
   }
   function duplicateBlock(block) {
     const expressions = [...block.expressions];
-    const children = [...block.children];
-    children.splice(children.indexOf(block.expressions), 1, expressions);
+    let children;
+    if (block.children === block.expressions) {
+      children = expressions;
+    } else {
+      children = [...block.children];
+      children.splice(children.indexOf(block.expressions), 1, expressions);
+    }
     return {
       ...block,
       expressions,
@@ -2023,8 +2032,7 @@ var Civet = (() => {
       throw new Error("Could not find iteration statement in iteration expression");
     }
     if (subtype === "DoStatement") {
-      insertReturn(block);
-      children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
+      children.splice(i, 1, ...wrapIIFE([["", statement, void 0]], async));
       updateParentPointers(exp);
       return;
     }
@@ -3266,13 +3274,17 @@ var Civet = (() => {
     forRange: () => forRange,
     gatherBindingCode: () => gatherBindingCode,
     gatherRecursive: () => gatherRecursive,
+    gatherRecursiveAll: () => gatherRecursiveAll,
+    gatherRecursiveWithinFunction: () => gatherRecursiveWithinFunction,
     getIndentLevel: () => getIndentLevel,
     getPrecedence: () => getPrecedence,
     getTrimmingSpace: () => getTrimmingSpace,
     hasAwait: () => hasAwait,
+    hasImportDeclaration: () => hasImportDeclaration,
     hasYield: () => hasYield,
     insertTrimmingSpace: () => insertTrimmingSpace,
     isEmptyBareBlock: () => isEmptyBareBlock,
+    isFunction: () => isFunction,
     isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
     lastAccessInCallExpression: () => lastAccessInCallExpression,
     literalValue: () => literalValue,
@@ -8817,11 +8829,14 @@ ${input.slice(result.pos)}
       });
       var NonSingleBracedBlock$1 = ImplicitNestedBlock;
       var NonSingleBracedBlock$2 = $TS($S(InsertOpenBrace, NestedImplicitObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+        var o = $1;
         var s = $2;
+        var c = $3;
+        const expressions = [s];
         return {
           type: "BlockStatement",
-          expressions: [s],
-          children: $0
+          expressions,
+          children: [o, expressions, c]
         };
       });
       var NonSingleBracedBlock$$ = [NonSingleBracedBlock$0, NonSingleBracedBlock$1, NonSingleBracedBlock$2];
@@ -16620,10 +16635,13 @@ ${input.slice(result.pos)}
     let ast;
     try {
       import_parser.parse.config = options.parseOptions || {};
-      ast = prune((0, import_parser.parse)(src, {
+      ast = (0, import_parser.parse)(src, {
         filename,
         events
-      }));
+      });
+      if (!(options.ast === "raw")) {
+        ast = prune(ast);
+      }
     } finally {
       if (hits || trace) {
         import("fs").then(function({ writeFileSync }) {

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);
         }

package/dist/main.js

@@ -227,6 +227,9 @@ function hasAwait(exp) {
 function hasYield(exp) {
   return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Yield").length > 0;
 }
+function hasImportDeclaration(exp) {
+  return gatherRecursiveWithinFunction(exp, ({ type }) => type === "ImportDeclaration").length > 0;
+}
 function deepCopy(node) {
   if (node == null)
     return node;
@@ -388,9 +391,10 @@ function parenthesizeType(type) {
   }
   return ["(", type, ")"];
 }
-function wrapIIFE(expressions, async) {
+function wrapIIFE(expressions, asyncFlag) {
   let prefix;
-  if (async) {
+  let async;
+  if (asyncFlag) {
     async = "async ";
   } else if (hasAwait(expressions)) {
     async = "async ";
@@ -578,16 +582,16 @@ function blockWithPrefix(prefixStatements, block) {
       expressions,
       children: block.children === block.expressions ? expressions : block.children.map((c) => c === block.expressions ? expressions : c)
     };
-    if (block.bare) {
-      block.children = [[" {"], ...block.children, "}"];
-      block.bare = false;
-    }
+    braceBlock(block);
     updateParentPointers(block);
   }
   return block;
 }
 function braceBlock(block) {
   if (block.bare) {
+    if (block.children === block.expressions) {
+      block.children = [block.expressions];
+    }
     block.children.unshift(" {");
     block.children.push("}");
     return block.bare = false;
@@ -597,8 +601,13 @@ function braceBlock(block) {
 }
 function duplicateBlock(block) {
   const expressions = [...block.expressions];
-  const children = [...block.children];
-  children.splice(children.indexOf(block.expressions), 1, expressions);
+  let children;
+  if (block.children === block.expressions) {
+    children = expressions;
+  } else {
+    children = [...block.children];
+    children.splice(children.indexOf(block.expressions), 1, expressions);
+  }
   return {
     ...block,
     expressions,
@@ -2015,8 +2024,7 @@ function expressionizeIteration(exp) {
     throw new Error("Could not find iteration statement in iteration expression");
   }
   if (subtype === "DoStatement") {
-    insertReturn(block);
-    children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
+    children.splice(i, 1, ...wrapIIFE([["", statement, void 0]], async));
     updateParentPointers(exp);
     return;
   }
@@ -3258,13 +3266,17 @@ __export(lib_exports, {
   forRange: () => forRange,
   gatherBindingCode: () => gatherBindingCode,
   gatherRecursive: () => gatherRecursive,
+  gatherRecursiveAll: () => gatherRecursiveAll,
+  gatherRecursiveWithinFunction: () => gatherRecursiveWithinFunction,
   getIndentLevel: () => getIndentLevel,
   getPrecedence: () => getPrecedence,
   getTrimmingSpace: () => getTrimmingSpace,
   hasAwait: () => hasAwait,
+  hasImportDeclaration: () => hasImportDeclaration,
   hasYield: () => hasYield,
   insertTrimmingSpace: () => insertTrimmingSpace,
   isEmptyBareBlock: () => isEmptyBareBlock,
+  isFunction: () => isFunction,
   isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
   lastAccessInCallExpression: () => lastAccessInCallExpression,
   literalValue: () => literalValue,
@@ -8809,11 +8821,14 @@ var require_parser = __commonJS({
     });
     var NonSingleBracedBlock$1 = ImplicitNestedBlock;
     var NonSingleBracedBlock$2 = $TS($S(InsertOpenBrace, NestedImplicitObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+      var o = $1;
       var s = $2;
+      var c = $3;
+      const expressions = [s];
       return {
         type: "BlockStatement",
-        expressions: [s],
-        children: $0
+        expressions,
+        children: [o, expressions, c]
       };
     });
     var NonSingleBracedBlock$$ = [NonSingleBracedBlock$0, NonSingleBracedBlock$1, NonSingleBracedBlock$2];
@@ -16613,10 +16628,13 @@ function compile(src, options) {
   let ast;
   try {
     import_parser.parse.config = options.parseOptions || {};
-    ast = prune((0, import_parser.parse)(src, {
+    ast = (0, import_parser.parse)(src, {
       filename,
       events
-    }));
+    });
+    if (!(options.ast === "raw")) {
+      ast = prune(ast);
+    }
   } finally {
     if (hits || trace) {
       import("fs").then(function({ writeFileSync }) {

package/dist/main.mjs

@@ -225,6 +225,9 @@ function hasAwait(exp) {
 function hasYield(exp) {
   return gatherRecursiveWithinFunction(exp, ({ type }) => type === "Yield").length > 0;
 }
+function hasImportDeclaration(exp) {
+  return gatherRecursiveWithinFunction(exp, ({ type }) => type === "ImportDeclaration").length > 0;
+}
 function deepCopy(node) {
   if (node == null)
     return node;
@@ -386,9 +389,10 @@ function parenthesizeType(type) {
   }
   return ["(", type, ")"];
 }
-function wrapIIFE(expressions, async) {
+function wrapIIFE(expressions, asyncFlag) {
   let prefix;
-  if (async) {
+  let async;
+  if (asyncFlag) {
     async = "async ";
   } else if (hasAwait(expressions)) {
     async = "async ";
@@ -576,16 +580,16 @@ function blockWithPrefix(prefixStatements, block) {
       expressions,
       children: block.children === block.expressions ? expressions : block.children.map((c) => c === block.expressions ? expressions : c)
     };
-    if (block.bare) {
-      block.children = [[" {"], ...block.children, "}"];
-      block.bare = false;
-    }
+    braceBlock(block);
     updateParentPointers(block);
   }
   return block;
 }
 function braceBlock(block) {
   if (block.bare) {
+    if (block.children === block.expressions) {
+      block.children = [block.expressions];
+    }
     block.children.unshift(" {");
     block.children.push("}");
     return block.bare = false;
@@ -595,8 +599,13 @@ function braceBlock(block) {
 }
 function duplicateBlock(block) {
   const expressions = [...block.expressions];
-  const children = [...block.children];
-  children.splice(children.indexOf(block.expressions), 1, expressions);
+  let children;
+  if (block.children === block.expressions) {
+    children = expressions;
+  } else {
+    children = [...block.children];
+    children.splice(children.indexOf(block.expressions), 1, expressions);
+  }
   return {
     ...block,
     expressions,
@@ -2013,8 +2022,7 @@ function expressionizeIteration(exp) {
     throw new Error("Could not find iteration statement in iteration expression");
   }
   if (subtype === "DoStatement") {
-    insertReturn(block);
-    children.splice(i, 1, ...wrapIIFE(["", statement, void 0], async));
+    children.splice(i, 1, ...wrapIIFE([["", statement, void 0]], async));
     updateParentPointers(exp);
     return;
   }
@@ -3256,13 +3264,17 @@ __export(lib_exports, {
   forRange: () => forRange,
   gatherBindingCode: () => gatherBindingCode,
   gatherRecursive: () => gatherRecursive,
+  gatherRecursiveAll: () => gatherRecursiveAll,
+  gatherRecursiveWithinFunction: () => gatherRecursiveWithinFunction,
   getIndentLevel: () => getIndentLevel,
   getPrecedence: () => getPrecedence,
   getTrimmingSpace: () => getTrimmingSpace,
   hasAwait: () => hasAwait,
+  hasImportDeclaration: () => hasImportDeclaration,
   hasYield: () => hasYield,
   insertTrimmingSpace: () => insertTrimmingSpace,
   isEmptyBareBlock: () => isEmptyBareBlock,
+  isFunction: () => isFunction,
   isWhitespaceOrEmpty: () => isWhitespaceOrEmpty,
   lastAccessInCallExpression: () => lastAccessInCallExpression,
   literalValue: () => literalValue,
@@ -8807,11 +8819,14 @@ var require_parser = __commonJS({
     });
     var NonSingleBracedBlock$1 = ImplicitNestedBlock;
     var NonSingleBracedBlock$2 = $TS($S(InsertOpenBrace, NestedImplicitObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+      var o = $1;
       var s = $2;
+      var c = $3;
+      const expressions = [s];
       return {
         type: "BlockStatement",
-        expressions: [s],
-        children: $0
+        expressions,
+        children: [o, expressions, c]
       };
     });
     var NonSingleBracedBlock$$ = [NonSingleBracedBlock$0, NonSingleBracedBlock$1, NonSingleBracedBlock$2];
@@ -16599,10 +16614,13 @@ function compile(src, options) {
   let ast;
   try {
     import_parser.parse.config = options.parseOptions || {};
-    ast = prune((0, import_parser.parse)(src, {
+    ast = (0, import_parser.parse)(src, {
       filename,
       events
-    }));
+    });
+    if (!(options.ast === "raw")) {
+      ast = prune(ast);
+    }
   } finally {
     if (hits || trace) {
       import("fs").then(function({ writeFileSync }) {

package/dist/types.d.ts

@@ -32,8 +32,13 @@ declare module "@danielx/civet" {
   }>
   export type CompileOptions = {
     filename?: string
-    js?: boolean
     sourceMap?: boolean
+    inlineMap?: boolean
+    ast?: boolean | "raw"
+    js?: boolean
+    noCache?: boolean
+    hits?: string
+    trace?: string
     parseOptions?: ParseOptions
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.6.88",
+  "version": "0.6.89",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",