@danielx/civet 0.2.12 → 0.2.13

package/dist/main.js

@@ -462,7 +462,8 @@ var require_parser = __commonJS({
       ThinArrowFunction,
       Block,
       BracedBlock,
-      SingleNestedBlockExpression,
+      SingleNestedExpression,
+      SingleNestedBlockStatement,
       NestedBlockExpressions,
       BlockExpression,
       Literal,
@@ -528,6 +529,8 @@ var require_parser = __commonJS({
       Condition,
       ExpressionStatement,
       KeywordStatement,
+      MaybeNestedExpression,
+      Return,
       ImportDeclaration,
       ImportClause,
       NameSpaceImport,
@@ -756,8 +759,8 @@ var require_parser = __commonJS({
     var $L107 = $L("break");
     var $L108 = $L("continue");
     var $L109 = $L("debugger");
-    var $L110 = $L("return");
-    var $L111 = $L("throw");
+    var $L110 = $L("throw");
+    var $L111 = $L("return");
     var $L112 = $L("import type");
     var $L113 = $L("from");
     var $L114 = $L("export");
@@ -1001,7 +1004,7 @@ var require_parser = __commonJS({
         return FatArrow$0(state);
       }
     }
-    var ConciseBody$0 = $S(EOS, SingleNestedBlockExpression);
+    var ConciseBody$0 = $S(EOS, SingleNestedBlockStatement);
     var ConciseBody$1 = $S($N($S($Q(_), $EXPECT($L11, fail, 'ConciseBody "{"'))), AssignmentExpression);
     var ConciseBody$2 = BracedBlock;
     function ConciseBody(state) {
@@ -1447,19 +1450,34 @@ var require_parser = __commonJS({
         return BracedBlock$0(state) || BracedBlock$1(state) || BracedBlock$2(state);
       }
     }
-    var SingleNestedBlockExpression$0 = $TS($S(PushIndent, $E($S(Nested, StatementListItem)), $C($C($N($S(Nested, StatementListItem)), $S(PopIndent, $N($EXPECT($L31, fail, 'SingleNestedBlockExpression ""')))), PopIndent)), function($skip, $loc, $0, $1, $2, $3) {
+    var SingleNestedExpression$0 = $TS($S(PushIndent, $E($S(Nested, Expression, StatementDelimiter)), $C($S($N($S(Nested, Expression)), PopIndent), $S(PopIndent, $N($EXPECT($L31, fail, 'SingleNestedExpression ""'))))), function($skip, $loc, $0, $1, $2, $3) {
       var exp = $2;
       if (exp)
         return exp;
       return $skip;
     });
-    function SingleNestedBlockExpression(state) {
+    function SingleNestedExpression(state) {
       if (state.verbose)
-        console.log("ENTER:", "SingleNestedBlockExpression");
+        console.log("ENTER:", "SingleNestedExpression");
       if (state.tokenize) {
-        return $TOKEN("SingleNestedBlockExpression", state, SingleNestedBlockExpression$0(state));
+        return $TOKEN("SingleNestedExpression", state, SingleNestedExpression$0(state));
       } else {
-        return SingleNestedBlockExpression$0(state);
+        return SingleNestedExpression$0(state);
+      }
+    }
+    var SingleNestedBlockStatement$0 = $TS($S(PushIndent, $E($S(Nested, StatementListItem)), $C($C($N($S(Nested, StatementListItem)), $S(PopIndent, $N($EXPECT($L31, fail, 'SingleNestedBlockStatement ""')))), PopIndent)), function($skip, $loc, $0, $1, $2, $3) {
+      var exp = $2;
+      if (exp)
+        return exp;
+      return $skip;
+    });
+    function SingleNestedBlockStatement(state) {
+      if (state.verbose)
+        console.log("ENTER:", "SingleNestedBlockStatement");
+      if (state.tokenize) {
+        return $TOKEN("SingleNestedBlockStatement", state, SingleNestedBlockStatement$0(state));
+      } else {
+        return SingleNestedBlockStatement$0(state);
       }
     }
     var NestedBlockExpressions$0 = $TS($S(PushIndent, $Q(BlockExpression), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
@@ -2241,14 +2259,33 @@ var require_parser = __commonJS({
     var KeywordStatement$0 = $S($EXPECT($L107, fail, 'KeywordStatement "break"'), NonIdContinue);
     var KeywordStatement$1 = $S($EXPECT($L108, fail, 'KeywordStatement "continue"'), NonIdContinue);
     var KeywordStatement$2 = $S($EXPECT($L109, fail, 'KeywordStatement "debugger"'), NonIdContinue);
-    var KeywordStatement$3 = $S($EXPECT($L110, fail, 'KeywordStatement "return"'), NonIdContinue, Expression);
-    var KeywordStatement$4 = $S($EXPECT($L110, fail, 'KeywordStatement "return"'), NonIdContinue);
-    var KeywordStatement$5 = $S($EXPECT($L111, fail, 'KeywordStatement "throw"'), NonIdContinue, Expression);
+    var KeywordStatement$3 = $S(Return, $E(MaybeNestedExpression));
+    var KeywordStatement$4 = $S($EXPECT($L110, fail, 'KeywordStatement "throw"'), NonIdContinue, Expression);
     function KeywordStatement(state) {
       if (state.tokenize) {
-        return $TOKEN("KeywordStatement", state, KeywordStatement$0(state) || KeywordStatement$1(state) || KeywordStatement$2(state) || KeywordStatement$3(state) || KeywordStatement$4(state) || KeywordStatement$5(state));
+        return $TOKEN("KeywordStatement", state, KeywordStatement$0(state) || KeywordStatement$1(state) || KeywordStatement$2(state) || KeywordStatement$3(state) || KeywordStatement$4(state));
+      } else {
+        return KeywordStatement$0(state) || KeywordStatement$1(state) || KeywordStatement$2(state) || KeywordStatement$3(state) || KeywordStatement$4(state);
+      }
+    }
+    var MaybeNestedExpression$0 = $S($N(EOS), $Q(TrailingComment), Expression);
+    var MaybeNestedExpression$1 = $S($Y(EOS), SingleNestedExpression);
+    var MaybeNestedExpression$2 = $S($Y(EOS), ObjectLiteral);
+    function MaybeNestedExpression(state) {
+      if (state.tokenize) {
+        return $TOKEN("MaybeNestedExpression", state, MaybeNestedExpression$0(state) || MaybeNestedExpression$1(state) || MaybeNestedExpression$2(state));
+      } else {
+        return MaybeNestedExpression$0(state) || MaybeNestedExpression$1(state) || MaybeNestedExpression$2(state);
+      }
+    }
+    var Return$0 = $S($EXPECT($L111, fail, 'Return "return"'), NonIdContinue);
+    function Return(state) {
+      if (state.verbose)
+        console.log("ENTER:", "Return");
+      if (state.tokenize) {
+        return $TOKEN("Return", state, Return$0(state));
       } else {
-        return KeywordStatement$0(state) || KeywordStatement$1(state) || KeywordStatement$2(state) || KeywordStatement$3(state) || KeywordStatement$4(state) || KeywordStatement$5(state);
+        return Return$0(state);
       }
     }
     var ImportDeclaration$0 = $T($S($EXPECT($L112, fail, 'ImportDeclaration "import type"'), NonIdContinue, __, ImportClause, __, FromClause), function(value) {
@@ -3565,7 +3602,9 @@ gen = require_generate();
 module.exports = {
   parse,
   compile: function(src, options) {
-    return gen(parse(src), options);
+    return gen(parse(src, {
+      filename: options != null ? options.filename : void 0
+    }), options);
   },
   generate: gen
 };

package/esbuild-plugin.js

@@ -0,0 +1,26 @@
+const { readFile } = require('fs/promises');
+const path = require('path');
+const { compile } = require("./");
+
+module.exports = {
+  name: 'civet',
+  setup(build) {
+    build.onLoad({
+      filter: /\.civet/
+    }, async function (args) {
+      return readFile(args.path, 'utf8')
+        .then(function (source) {
+          const filename = path.relative(process.cwd(), args.path);
+          return {
+            contents: compile(source, { filename, js: true })
+          };
+        }).catch(function (e) {
+          return {
+            errors: [{
+              text: e.message
+            }]
+          };
+        });
+    });
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "types": "dist/types.d.ts",
@@ -9,6 +9,7 @@
   },
   "files": [
     "dist/",
+    "esbuild-plugin.js",
     "register.js",
     "register.mjs"
   ],