@danielx/civet 0.4.19-pre.6 → 0.4.19-pre.7

package/dist/browser.js

@@ -2406,14 +2406,24 @@ var Civet = (() => {
       }
       var Block$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace), function(value) {
         var exps = value[3];
-        return { "type": "BlockStatement", "expressions": exps, "children": value };
+        return { "type": "BlockStatement", "expressions": exps, "children": value, "bare": false };
       });
       var Block$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
         var exps = value[2];
-        return { "type": "BlockStatement", "expressions": exps, "children": value };
+        return { "type": "BlockStatement", "expressions": exps, "children": value, "bare": false };
       });
       var Block$2 = ThenClause;
-      var Block$3 = $S($Q(TrailingComment), Statement);
+      var Block$3 = $TS($S($Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2) {
+        var ws = $1;
+        var s = $2;
+        const expressions = [$0];
+        return {
+          type: "BlockStatement",
+          expressions,
+          children: [expressions],
+          bare: true
+        };
+      });
       function Block(state) {
         if (state.tokenize) {
           return $TOKEN("Block", state, Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state));
@@ -2421,8 +2431,16 @@ var Civet = (() => {
           return Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state);
         }
       }
-      var ThenClause$0 = $T($S(Then, $Q(TrailingComment), Statement), function(value) {
-        return [value[1], value[2]];
+      var ThenClause$0 = $TS($S(Then, $Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2, $3) {
+        var ws = $2;
+        var s = $3;
+        const expressions = [[ws, s]];
+        return {
+          type: "BlockStatement",
+          expressions,
+          children: [expressions],
+          bare: true
+        };
       });
       function ThenClause(state) {
         if (state.verbose)
@@ -4077,10 +4095,18 @@ var Civet = (() => {
         var expressions = value[2];
         return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
       });
-      var CaseClause$1 = $T($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function(value) {
-        var cases = value[1];
-        var expressions = value[2];
-        return { "type": "WhenClause", "cases": cases, "expressions": expressions, "children": value };
+      var CaseClause$1 = $TS($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var cases = $2;
+        var expressions = $3;
+        if (expressions.expressions) {
+          expressions = expressions.expressions;
+        }
+        return {
+          type: "WhenClause",
+          cases,
+          expressions,
+          children: $0
+        };
       });
       var CaseClause$2 = $T($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function(value) {
         var exps = value[2];

package/dist/civet

@@ -10,7 +10,13 @@ if (process.argv.includes("--version")) {
 encoding = "utf8";
 process.stdin.setEncoding(encoding);
 fs = require("fs");
-readline = require("node:readline");
+readline = function() {
+  try {
+    return require("node:readline");
+  } catch (error) {
+    return require("readline");
+  }
+}();
 readLines = function(rl) {
   return new Promise(function(resolve, reject) {
     var parts;
@@ -45,6 +51,6 @@ readLines(readline.createInterface(process.stdin)).then(function(input) {
   output = compile(input, { filename, js, inlineMap });
   return process.stdout.write(output);
 }).catch(function(e) {
-  console.error(e.message);
+  console.error(e);
   return process.exit(1);
 });

package/dist/main.js

@@ -2405,14 +2405,24 @@ var require_parser = __commonJS({
     }
     var Block$0 = $T($S(__, OpenBrace, EOS, NestedBlockStatements, __, CloseBrace), function(value) {
       var exps = value[3];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
+      return { "type": "BlockStatement", "expressions": exps, "children": value, "bare": false };
     });
     var Block$1 = $T($S(InsertOpenBrace, EOS, NestedBlockStatements, InsertNewline, InsertIndent, InsertCloseBrace), function(value) {
       var exps = value[2];
-      return { "type": "BlockStatement", "expressions": exps, "children": value };
+      return { "type": "BlockStatement", "expressions": exps, "children": value, "bare": false };
     });
     var Block$2 = ThenClause;
-    var Block$3 = $S($Q(TrailingComment), Statement);
+    var Block$3 = $TS($S($Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      var s = $2;
+      const expressions = [$0];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: [expressions],
+        bare: true
+      };
+    });
     function Block(state) {
       if (state.tokenize) {
         return $TOKEN("Block", state, Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state));
@@ -2420,8 +2430,16 @@ var require_parser = __commonJS({
         return Block$0(state) || Block$1(state) || Block$2(state) || Block$3(state);
       }
     }
-    var ThenClause$0 = $T($S(Then, $Q(TrailingComment), Statement), function(value) {
-      return [value[1], value[2]];
+    var ThenClause$0 = $TS($S(Then, $Q(TrailingComment), Statement), function($skip, $loc, $0, $1, $2, $3) {
+      var ws = $2;
+      var s = $3;
+      const expressions = [[ws, s]];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: [expressions],
+        bare: true
+      };
     });
     function ThenClause(state) {
       if (state.verbose)
@@ -4076,10 +4094,18 @@ var require_parser = __commonJS({
       var expressions = value[2];
       return { "type": "CaseClause", "cases": cases, "expressions": expressions, "children": value };
     });
-    var CaseClause$1 = $T($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function(value) {
-      var cases = value[1];
-      var expressions = value[2];
-      return { "type": "WhenClause", "cases": cases, "expressions": expressions, "children": value };
+    var CaseClause$1 = $TS($S(When, CaseExpressionList, $C(ThenClause, NestedBlockStatements), InsertBreak), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var cases = $2;
+      var expressions = $3;
+      if (expressions.expressions) {
+        expressions = expressions.expressions;
+      }
+      return {
+        type: "WhenClause",
+        cases,
+        expressions,
+        children: $0
+      };
     });
     var CaseClause$2 = $T($S(Default, ImpliedColon, $C(NestedBlockStatements, NoExpressions)), function(value) {
       var exps = value[2];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.4.19-pre.6",
+  "version": "0.4.19-pre.7",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {