@danielx/civet 0.4.1-8.1 → 0.4.1-8.2

package/dist/browser.js

@@ -985,7 +985,7 @@ var Civet = (() => {
       var $R27 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
       var $R28 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
       var $R29 = $R(new RegExp(".", "suy"));
-      var $R30 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
+      var $R30 = $R(new RegExp("#(?!##)([^\\r\\n]*)", "suy"));
       var $R31 = $R(new RegExp("[^\\r\\n]", "suy"));
       var $R32 = $R(new RegExp("[ \\t]+", "suy"));
       var $R33 = $R(new RegExp("[\\s]+", "suy"));
@@ -1174,7 +1174,7 @@ var Civet = (() => {
           return IndentedApplicationAllowed$0(state);
         }
       }
-      var BinaryOpExpression$0 = $TS($S(UnaryExpression, $Q($S(__, BinaryOp, __, UnaryExpression))), function($skip, $loc, $0, $1, $2) {
+      var BinaryOpExpression$0 = $TS($S(UnaryExpression, $Q($S(__, BinaryOp, __, $C(UnaryExpression, ExpressionizedStatement)))), function($skip, $loc, $0, $1, $2) {
         if ($2.length) {
           return module.processBinaryOpExpression($0);
         }
@@ -1706,10 +1706,10 @@ var Civet = (() => {
           return MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state);
         }
       }
-      var MemberBracketContent$0 = $TS($S(OpenBracket, ExtendedExpression, $E($S($C(DotDotDot, DotDot), $E(ExtendedExpression))), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var MemberBracketContent$0 = $TS($S(OpenBracket, ExtendedExpression, $E($S(__, $C(DotDotDot, DotDot), $E(ExtendedExpression))), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         if ($3) {
-          const sep = $3[0];
-          const end = $3[1];
+          const sep = $3[1];
+          const end = $3[2];
           const inclusive = sep.token === "..";
           sep.token = ", ";
           $1.token = ".slice(";
@@ -1723,6 +1723,7 @@ var Civet = (() => {
             };
           }
           if (inclusive) {
+            module.insertTrimmingSpace(end, "");
             return {
               type: "SliceExpression",
               start: $2,
@@ -2308,8 +2309,18 @@ var Civet = (() => {
         var exps = value[2];
         return { "type": "BlockStatement", "expressions": exps, "children": value };
       });
-      var BracedBlock$2 = $TS($S(InsertOpenBrace, $N(EOS), __, Statement, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var BracedBlock$2 = $TS($S(InsertOpenBrace, $Y(EOS), ObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var s = $3;
+        $0.splice(1, 1);
+        return {
+          type: "BlockStatement",
+          expressions: [s],
+          children: $0
+        };
+      });
+      var BracedBlock$3 = $TS($S(InsertOpenBrace, $N(EOS), __, Statement, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var s = $4;
+        $0.splice(1, 1);
         return {
           type: "BlockStatement",
           expressions: [s],
@@ -2318,9 +2329,9 @@ var Civet = (() => {
       });
       function BracedBlock(state) {
         if (state.tokenize) {
-          return $TOKEN("BracedBlock", state, BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state));
+          return $TOKEN("BracedBlock", state, BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state) || BracedBlock$3(state));
         } else {
-          return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state);
+          return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state) || BracedBlock$3(state);
         }
       }
       var BracedContent$0 = $T($S($Y(EOS), NestedBlockStatements), function(value) {
@@ -2662,7 +2673,10 @@ var Civet = (() => {
       var NestedObjectLiteral$0 = $TS($S(InsertOpenBrace, $Y(EOS), NestedPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         $3.unshift($1);
         $3.push($4, $5, $6);
-        return $3;
+        return {
+          type: "ObjectExpression",
+          children: $3
+        };
       });
       function NestedObjectLiteral(state) {
         if (state.verbose)
@@ -4603,7 +4617,7 @@ var Civet = (() => {
           return JSMultiLineComment$0(state);
         }
       }
-      var CoffeeSingleLineComment$0 = $TR($EXPECT($R30, fail, "CoffeeSingleLineComment /#([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CoffeeSingleLineComment$0 = $TR($EXPECT($R30, fail, "CoffeeSingleLineComment /#(?!##)([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: `//${$1}` };
       });
       function CoffeeSingleLineComment(state) {
@@ -6565,6 +6579,10 @@ var Civet = (() => {
             case "BlockStatement":
               insertReturn(node.expressions[node.expressions.length - 1]);
               return;
+            case "ObjectExpression":
+              module.insertTrimmingSpace(node.children[0], "");
+              node.children.unshift("return ");
+              return;
             case "CaseBlock":
               node.clauses.forEach((clause) => {
                 insertReturn(clause);
@@ -7059,6 +7077,7 @@ var Civet = (() => {
   // source/generate.coffee
   var require_generate = __commonJS({
     "source/generate.coffee"(exports, module) {
+      "civet coffeeCompat";
       var gen;
       var prune;
       gen = function(node, options) {
@@ -7136,6 +7155,7 @@ var Civet = (() => {
   var require_util = __commonJS({
     "source/util.coffee"(exports, module) {
       "use strict";
+      "civet coffeeCompat";
       var BASE64_CHARS;
       var SourceMap;
       var VLQ_CONTINUATION_BIT;
@@ -7460,6 +7480,7 @@ var Civet = (() => {
   // source/main.coffee
   var require_main = __commonJS({
     "source/main.coffee"(exports, module) {
+      "civet coffeeCompat";
       var SourceMap;
       var base64Encode;
       var defaultOptions;

package/dist/civet

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 "use strict";
-var ast, compile, encoding, fs, generate, inlineMap, input, js, output, parse, prune;
+var compile, encoding, fs, generate, parse, prune, read;
 if (process.argv.includes("--version")) {
   process.stdout.write(require("../package.json").version + "\n");
   process.exit(0);
@@ -9,14 +9,30 @@ if (process.argv.includes("--version")) {
 ({ prune } = generate);
 encoding = "utf8";
 fs = require("fs");
-input = fs.readFileSync(process.stdin.fd, encoding);
-process.argv.includes("--ast");
-js = process.argv.includes("--js");
-inlineMap = process.argv.includes("--inline-map");
-if (ast) {
-  ast = prune(parse(input));
-  process.stdout.write(JSON.stringify(ast, null, 2));
-  process.exit(0);
-}
-output = compile(input, { js, inlineMap });
-process.stdout.write(output);
+read = function(stream, encoding2) {
+  return new Promise(function(resolve, reject) {
+    var parts;
+    parts = [];
+    stream.resume();
+    stream.on("data", function(buffer) {
+      return parts.push(buffer);
+    });
+    stream.on("error", reject);
+    return stream.on("end", function() {
+      return resolve(Buffer.concat(parts).toString(encoding2));
+    });
+  });
+};
+read(process.stdin, encoding).then(function(input) {
+  var ast, inlineMap, js, output;
+  process.argv.includes("--ast");
+  js = process.argv.includes("--js");
+  inlineMap = process.argv.includes("--inline-map");
+  if (ast) {
+    ast = prune(parse(input));
+    process.stdout.write(JSON.stringify(ast, null, 2));
+    process.exit(0);
+  }
+  output = compile(input, { js, inlineMap });
+  return process.stdout.write(output);
+});

package/dist/main.js

@@ -984,7 +984,7 @@ var require_parser = __commonJS({
     var $R27 = $R(new RegExp("(?:and|as|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|function|if|import|in|instanceof|interface|is|loop|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|until|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
     var $R28 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
     var $R29 = $R(new RegExp(".", "suy"));
-    var $R30 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
+    var $R30 = $R(new RegExp("#(?!##)([^\\r\\n]*)", "suy"));
     var $R31 = $R(new RegExp("[^\\r\\n]", "suy"));
     var $R32 = $R(new RegExp("[ \\t]+", "suy"));
     var $R33 = $R(new RegExp("[\\s]+", "suy"));
@@ -1173,7 +1173,7 @@ var require_parser = __commonJS({
         return IndentedApplicationAllowed$0(state);
       }
     }
-    var BinaryOpExpression$0 = $TS($S(UnaryExpression, $Q($S(__, BinaryOp, __, UnaryExpression))), function($skip, $loc, $0, $1, $2) {
+    var BinaryOpExpression$0 = $TS($S(UnaryExpression, $Q($S(__, BinaryOp, __, $C(UnaryExpression, ExpressionizedStatement)))), function($skip, $loc, $0, $1, $2) {
       if ($2.length) {
         return module2.processBinaryOpExpression($0);
       }
@@ -1705,10 +1705,10 @@ var require_parser = __commonJS({
         return MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state);
       }
     }
-    var MemberBracketContent$0 = $TS($S(OpenBracket, ExtendedExpression, $E($S($C(DotDotDot, DotDot), $E(ExtendedExpression))), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var MemberBracketContent$0 = $TS($S(OpenBracket, ExtendedExpression, $E($S(__, $C(DotDotDot, DotDot), $E(ExtendedExpression))), __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       if ($3) {
-        const sep = $3[0];
-        const end = $3[1];
+        const sep = $3[1];
+        const end = $3[2];
         const inclusive = sep.token === "..";
         sep.token = ", ";
         $1.token = ".slice(";
@@ -1722,6 +1722,7 @@ var require_parser = __commonJS({
           };
         }
         if (inclusive) {
+          module2.insertTrimmingSpace(end, "");
           return {
             type: "SliceExpression",
             start: $2,
@@ -2307,8 +2308,18 @@ var require_parser = __commonJS({
       var exps = value[2];
       return { "type": "BlockStatement", "expressions": exps, "children": value };
     });
-    var BracedBlock$2 = $TS($S(InsertOpenBrace, $N(EOS), __, Statement, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var BracedBlock$2 = $TS($S(InsertOpenBrace, $Y(EOS), ObjectLiteral, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var s = $3;
+      $0.splice(1, 1);
+      return {
+        type: "BlockStatement",
+        expressions: [s],
+        children: $0
+      };
+    });
+    var BracedBlock$3 = $TS($S(InsertOpenBrace, $N(EOS), __, Statement, InsertSpace, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var s = $4;
+      $0.splice(1, 1);
       return {
         type: "BlockStatement",
         expressions: [s],
@@ -2317,9 +2328,9 @@ var require_parser = __commonJS({
     });
     function BracedBlock(state) {
       if (state.tokenize) {
-        return $TOKEN("BracedBlock", state, BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state));
+        return $TOKEN("BracedBlock", state, BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state) || BracedBlock$3(state));
       } else {
-        return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state);
+        return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state) || BracedBlock$3(state);
       }
     }
     var BracedContent$0 = $T($S($Y(EOS), NestedBlockStatements), function(value) {
@@ -2661,7 +2672,10 @@ var require_parser = __commonJS({
     var NestedObjectLiteral$0 = $TS($S(InsertOpenBrace, $Y(EOS), NestedPropertyDefinitions, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       $3.unshift($1);
       $3.push($4, $5, $6);
-      return $3;
+      return {
+        type: "ObjectExpression",
+        children: $3
+      };
     });
     function NestedObjectLiteral(state) {
       if (state.verbose)
@@ -4602,7 +4616,7 @@ var require_parser = __commonJS({
         return JSMultiLineComment$0(state);
       }
     }
-    var CoffeeSingleLineComment$0 = $TR($EXPECT($R30, fail, "CoffeeSingleLineComment /#([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var CoffeeSingleLineComment$0 = $TR($EXPECT($R30, fail, "CoffeeSingleLineComment /#(?!##)([^\\r\\n]*)/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: `//${$1}` };
     });
     function CoffeeSingleLineComment(state) {
@@ -6564,6 +6578,10 @@ var require_parser = __commonJS({
           case "BlockStatement":
             insertReturn(node.expressions[node.expressions.length - 1]);
             return;
+          case "ObjectExpression":
+            module2.insertTrimmingSpace(node.children[0], "");
+            node.children.unshift("return ");
+            return;
           case "CaseBlock":
             node.clauses.forEach((clause) => {
               insertReturn(clause);
@@ -7058,6 +7076,7 @@ var require_parser = __commonJS({
 // source/generate.coffee
 var require_generate = __commonJS({
   "source/generate.coffee"(exports2, module2) {
+    "civet coffeeCompat";
     var gen2;
     var prune2;
     gen2 = function(node, options) {
@@ -7135,6 +7154,7 @@ var require_generate = __commonJS({
 var require_util = __commonJS({
   "source/util.coffee"(exports2, module2) {
     "use strict";
+    "civet coffeeCompat";
     var BASE64_CHARS;
     var SourceMap2;
     var VLQ_CONTINUATION_BIT;
@@ -7457,6 +7477,7 @@ var require_util = __commonJS({
 });
 
 // source/main.coffee
+"civet coffeeCompat";
 var SourceMap;
 var base64Encode;
 var defaultOptions;

package/package.json

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