@danielx/civet 0.2.6 → 0.2.9

package/dist/main.js

@@ -420,6 +420,7 @@ var require_parser = __commonJS({
       AssignmentExpressionRest,
       YieldExpression,
       ArrowFunction,
+      FatArrow,
       ConciseBody,
       ConditionalExpression,
       ShortCircuitExpression,
@@ -497,6 +498,8 @@ var require_parser = __commonJS({
       BinaryOp,
       UnaryOp,
       ModuleItem,
+      StatementListItem,
+      PostfixConditional,
       Statement,
       EmptyStatement,
       BlockStatement,
@@ -725,10 +728,10 @@ var require_parser = __commonJS({
     var $L82 = $L("delete");
     var $L83 = $L("void");
     var $L84 = $L("typeof");
-    var $L85 = $L(";");
-    var $L86 = $L("if");
-    var $L87 = $L("else");
-    var $L88 = $L("unless");
+    var $L85 = $L("if");
+    var $L86 = $L("unless");
+    var $L87 = $L(";");
+    var $L88 = $L("else");
     var $L89 = $L("loop");
     var $L90 = $L("do");
     var $L91 = $L("while");
@@ -950,7 +953,7 @@ var require_parser = __commonJS({
     }
     var AssignmentExpressionRest$0 = YieldExpression;
     var AssignmentExpressionRest$1 = $S($E($S($EXPECT($L7, fail, 'AssignmentExpressionRest "async"'), __)), ArrowFunction);
-    var AssignmentExpressionRest$2 = $S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), $C($S($Q(_), Expression), $S(__, Expression)));
+    var AssignmentExpressionRest$2 = $S($P($S(__, LeftHandSideExpression, __, AssignmentOp)), Expression);
     var AssignmentExpressionRest$3 = ConditionalExpression;
     function AssignmentExpressionRest(state) {
       if (state.tokenize) {
@@ -970,7 +973,7 @@ var require_parser = __commonJS({
       }
     }
     var ArrowFunction$0 = ThinArrowFunction;
-    var ArrowFunction$1 = $S($C(BindingIdentifier, Parameters), $E(ReturnTypeSuffix), __, $EXPECT($L10, fail, 'ArrowFunction "=>"'), ConciseBody);
+    var ArrowFunction$1 = $S(Parameters, $E(ReturnTypeSuffix), FatArrow, ConciseBody);
     function ArrowFunction(state) {
       if (state.tokenize) {
         return $TOKEN("ArrowFunction", state, ArrowFunction$0(state) || ArrowFunction$1(state));
@@ -978,8 +981,23 @@ var require_parser = __commonJS({
         return ArrowFunction$0(state) || ArrowFunction$1(state);
       }
     }
-    var ConciseBody$0 = $S($N($S($Q(_), $EXPECT($L11, fail, 'ConciseBody "{"'))), AssignmentExpression);
-    var ConciseBody$1 = $S(EOS, SingleNestedBlockExpression);
+    var FatArrow$0 = $TS($S(__, $EXPECT($L10, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      if (!ws.length)
+        return " =>";
+      return $0;
+    });
+    function FatArrow(state) {
+      if (state.verbose)
+        console.log("ENTER:", "FatArrow");
+      if (state.tokenize) {
+        return $TOKEN("FatArrow", state, FatArrow$0(state));
+      } else {
+        return FatArrow$0(state);
+      }
+    }
+    var ConciseBody$0 = $S(EOS, SingleNestedBlockExpression);
+    var ConciseBody$1 = $S($N($S($Q(_), $EXPECT($L11, fail, 'ConciseBody "{"'))), AssignmentExpression);
     var ConciseBody$2 = BracedBlock;
     function ConciseBody(state) {
       if (state.tokenize) {
@@ -1418,7 +1436,7 @@ var require_parser = __commonJS({
         return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state);
       }
     }
-    var SingleNestedBlockExpression$0 = $TS($S(PushIndent, $E($S(Nested, $C(Declaration, Statement))), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
+    var SingleNestedBlockExpression$0 = $TS($S(PushIndent, $E($S(Nested, StatementListItem)), $C($C($N($S(Nested, StatementListItem)), $S(PopIndent, $N($EXPECT($L30, fail, 'SingleNestedBlockExpression ""')))), PopIndent)), function($skip, $loc, $0, $1, $2, $3) {
       var exp = $2;
       if (exp)
         return exp;
@@ -1448,7 +1466,7 @@ var require_parser = __commonJS({
         return NestedBlockExpressions$0(state);
       }
     }
-    var BlockExpression$0 = $S(Nested, $C(Declaration, Statement), StatementDelimiter);
+    var BlockExpression$0 = $S(Nested, StatementListItem, StatementDelimiter);
     function BlockExpression(state) {
       if (state.verbose)
         console.log("ENTER:", "BlockExpression");
@@ -1858,13 +1876,45 @@ var require_parser = __commonJS({
     }
     var ModuleItem$0 = ImportDeclaration;
     var ModuleItem$1 = ExportDeclaration;
-    var ModuleItem$2 = Declaration;
-    var ModuleItem$3 = Statement;
+    var ModuleItem$2 = StatementListItem;
     function ModuleItem(state) {
       if (state.tokenize) {
-        return $TOKEN("ModuleItem", state, ModuleItem$0(state) || ModuleItem$1(state) || ModuleItem$2(state) || ModuleItem$3(state));
+        return $TOKEN("ModuleItem", state, ModuleItem$0(state) || ModuleItem$1(state) || ModuleItem$2(state));
       } else {
-        return ModuleItem$0(state) || ModuleItem$1(state) || ModuleItem$2(state) || ModuleItem$3(state);
+        return ModuleItem$0(state) || ModuleItem$1(state) || ModuleItem$2(state);
+      }
+    }
+    var StatementListItem$0 = $TS($S($C(Declaration, Statement), $E(PostfixConditional)), function($skip, $loc, $0, $1, $2) {
+      var statement = $1;
+      var cond = $2;
+      if (cond)
+        return [cond, statement, "}"];
+      return $0;
+    });
+    function StatementListItem(state) {
+      if (state.verbose)
+        console.log("ENTER:", "StatementListItem");
+      if (state.tokenize) {
+        return $TOKEN("StatementListItem", state, StatementListItem$0(state));
+      } else {
+        return StatementListItem$0(state);
+      }
+    }
+    var PostfixConditional$0 = $TS($S($Q(TrailingComment), $C($EXPECT($L85, fail, 'PostfixConditional "if"'), $EXPECT($L86, fail, 'PostfixConditional "unless"')), NonIdContinue, Expression), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ws = $1;
+      var cond = $2;
+      var exp = $4;
+      if (cond === "if")
+        return [ws, "if(", exp, ") {"];
+      return [ws, "if(!(", exp, ")) {"];
+    });
+    function PostfixConditional(state) {
+      if (state.verbose)
+        console.log("ENTER:", "PostfixConditional");
+      if (state.tokenize) {
+        return $TOKEN("PostfixConditional", state, PostfixConditional$0(state));
+      } else {
+        return PostfixConditional$0(state);
       }
     }
     var Statement$0 = KeywordStatement;
@@ -1883,7 +1933,7 @@ var require_parser = __commonJS({
         return Statement$0(state) || Statement$1(state) || Statement$2(state) || Statement$3(state) || Statement$4(state) || Statement$5(state) || Statement$6(state) || Statement$7(state) || Statement$8(state);
       }
     }
-    var EmptyStatement$0 = $S($Q(TrailingComment), $Y($EXPECT($L85, fail, 'EmptyStatement ";"')));
+    var EmptyStatement$0 = $S($Q(TrailingComment), $Y($EXPECT($L87, fail, 'EmptyStatement ";"')));
     function EmptyStatement(state) {
       if (state.verbose)
         console.log("ENTER:", "EmptyStatement");
@@ -1903,8 +1953,8 @@ var require_parser = __commonJS({
         return BlockStatement$0(state);
       }
     }
-    var IfStatement$0 = $S($EXPECT($L86, fail, 'IfStatement "if"'), Condition, Block, $E($S(__, $EXPECT($L87, fail, 'IfStatement "else"'), Block)));
-    var IfStatement$1 = $TS($S($EXPECT($L88, fail, 'IfStatement "unless"'), Condition, Block), function($skip, $loc, $0, $1, $2, $3) {
+    var IfStatement$0 = $S($EXPECT($L85, fail, 'IfStatement "if"'), Condition, Block, $E($S(__, $EXPECT($L88, fail, 'IfStatement "else"'), Block)));
+    var IfStatement$1 = $TS($S($EXPECT($L86, fail, 'IfStatement "unless"'), Condition, Block), function($skip, $loc, $0, $1, $2, $3) {
       var condition = $2;
       var block = $3;
       return ["if", condition.map((c) => {
@@ -1967,7 +2017,7 @@ var require_parser = __commonJS({
         return WhileStatement$0(state);
       }
     }
-    var ForStatement$0 = $S($EXPECT($L92, fail, 'ForStatement "for"'), __, $EXPECT($L1, fail, 'ForStatement "("'), __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, $EXPECT($L85, fail, 'ForStatement ";"'), __, $E(Expression), $EXPECT($L85, fail, 'ForStatement ";"'), __, $E(Expression), $EXPECT($L2, fail, 'ForStatement ")"'), Block);
+    var ForStatement$0 = $S($EXPECT($L92, fail, 'ForStatement "for"'), __, $EXPECT($L1, fail, 'ForStatement "("'), __, $C(LexicalDeclaration, VariableStatement, $E(Expression)), __, $EXPECT($L87, fail, 'ForStatement ";"'), __, $E(Expression), $EXPECT($L87, fail, 'ForStatement ";"'), __, $E(Expression), $EXPECT($L2, fail, 'ForStatement ")"'), Block);
     function ForStatement(state) {
       if (state.verbose)
         console.log("ENTER:", "ForStatement");
@@ -2688,7 +2738,7 @@ var require_parser = __commonJS({
         return __$0(state);
       }
     }
-    var StatementDelimiter$0 = $S($Q(TrailingComment), $EXPECT($L85, fail, 'StatementDelimiter ";"'), $Q(TrailingComment));
+    var StatementDelimiter$0 = $S($Q(TrailingComment), $EXPECT($L87, fail, 'StatementDelimiter ";"'), $Q(TrailingComment));
     var StatementDelimiter$1 = $T($Y(EOS), function(value) {
       return [";", value];
     });
@@ -2933,7 +2983,7 @@ var require_parser = __commonJS({
         return InterfaceProperty$0(state);
       }
     }
-    var InterfacePropertyDelimiter$0 = $S($Q(_), $EXPECT($L85, fail, 'InterfacePropertyDelimiter ";"'));
+    var InterfacePropertyDelimiter$0 = $S($Q(_), $EXPECT($L87, fail, 'InterfacePropertyDelimiter ";"'));
     var InterfacePropertyDelimiter$1 = $Y($S($Q(_), $EXPECT($L16, fail, 'InterfacePropertyDelimiter "}"')));
     var InterfacePropertyDelimiter$2 = $T($Y($S(__, $EXPECT($L16, fail, 'InterfacePropertyDelimiter "}"'))), function(value) {
       return ";";
@@ -3466,5 +3516,6 @@ module.exports = {
   parse,
   compile: function(src, options) {
     return gen(parse(src), options);
-  }
+  },
+  generate: gen
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.2.6",
+  "version": "0.2.9",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "bin": {
@@ -37,7 +37,7 @@
       "coffeescript/register",
       "@danielx/hera/register"
     ],
-    "reporter": "spec",
+    "reporter": "dot",
     "recursive": true,
     "spec": [
       "test"