@danielx/civet 0.3.5 → 0.3.7

package/dist/main.js

@@ -838,7 +838,7 @@ var require_parser = __commonJS({
     var $R15 = $R(new RegExp("(?:\\\\.|[^\\/\\r\\n])+", "suy"));
     var $R16 = $R(new RegExp("(?:\\p{ID_Continue}|[\\u200C\\u200D$])*", "suy"));
     var $R17 = $R(new RegExp("(?:\\$(?!\\{)|\\\\.|[^$`])+", "suy"));
-    var $R18 = $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|new|null|or|return|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
+    var $R18 = $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|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})", "suy"));
     var $R19 = $R(new RegExp("\\/\\/[^\\r\\n]*", "suy"));
     var $R20 = $R(new RegExp(".", "suy"));
     var $R21 = $R(new RegExp("#([^\\r\\n]*)", "suy"));
@@ -1213,8 +1213,8 @@ var require_parser = __commonJS({
         return NestedClassElement$0(state);
       }
     }
-    var ClassElement$0 = $S(Static, BracedBlock);
-    var ClassElement$1 = $S($E($S(Static, __)), $C(MethodDefinition, FieldDefinition));
+    var ClassElement$0 = $S($E($S(Static, $Q(TrailingComment))), $C(MethodDefinition, FieldDefinition));
+    var ClassElement$1 = $S(Static, BracedBlock);
     function ClassElement(state) {
       if (state.tokenize) {
         return $TOKEN("ClassElement", state, ClassElement$0(state) || ClassElement$1(state));
@@ -1223,7 +1223,7 @@ var require_parser = __commonJS({
       }
     }
     var Static$0 = $TV($EXPECT($L18, fail, 'Static "static"'), function($skip, $loc, $0, $1) {
-      return { $loc, token: $0 };
+      return { $loc, token: $1 };
     });
     function Static(state) {
       if (state.verbose)
@@ -1234,14 +1234,27 @@ var require_parser = __commonJS({
         return Static$0(state);
       }
     }
-    var FieldDefinition$0 = $S(ClassElementName, $E(TypeSuffix), $E(Initializer));
+    var FieldDefinition$0 = $TS($S(ClassElementName, $E(TypeSuffix), __, ConstAssignment, AssignmentExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var name = $1;
+      var suffix = $2;
+      var ws = $3;
+      var ca = $4;
+      var exp = $5;
+      return [
+        { ts: true, token: "readonly ", $loc: ca.$loc },
+        name,
+        suffix,
+        ws,
+        { token: "=", $loc: ca.$loc },
+        exp
+      ];
+    });
+    var FieldDefinition$1 = $S(ClassElementName, $E(TypeSuffix), $E(Initializer));
     function FieldDefinition(state) {
-      if (state.verbose)
-        console.log("ENTER:", "FieldDefinition");
       if (state.tokenize) {
-        return $TOKEN("FieldDefinition", state, FieldDefinition$0(state));
+        return $TOKEN("FieldDefinition", state, FieldDefinition$0(state) || FieldDefinition$1(state));
       } else {
-        return FieldDefinition$0(state);
+        return FieldDefinition$0(state) || FieldDefinition$1(state);
       }
     }
     var This$0 = $TV($EXPECT($L19, fail, 'This "this"'), function($skip, $loc, $0, $1) {
@@ -1408,7 +1421,7 @@ var require_parser = __commonJS({
         return MetaProperty$0(state) || MetaProperty$1(state);
       }
     }
-    var Parameters$0 = $S($EXPECT($L1, fail, 'Parameters "("'), $Q(ParameterElement), __, $EXPECT($L2, fail, 'Parameters ")"'));
+    var Parameters$0 = $S($E(TypeParameters), $EXPECT($L1, fail, 'Parameters "("'), $Q(ParameterElement), __, $EXPECT($L2, fail, 'Parameters ")"'));
     var Parameters$1 = $T($EXPECT($L32, fail, 'Parameters ""'), function(value) {
       return "()";
     });
@@ -3033,7 +3046,7 @@ var require_parser = __commonJS({
         return TemplateCharacters$0(state);
       }
     }
-    var ReservedWord$0 = $R$0($EXPECT($R18, fail, "ReservedWord /(?: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|new|null|or|return|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
+    var ReservedWord$0 = $R$0($EXPECT($R18, fail, "ReservedWord /(?: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|new|null|or|return|static|super|switch|this|throw|true|try|typeof|unless|var|void|while|with|yield)(?!\\p{ID_Continue})/"));
     function ReservedWord(state) {
       if (state.verbose)
         console.log("ENTER:", "ReservedWord");
@@ -3672,7 +3685,9 @@ var require_parser = __commonJS({
         return TypeArguments$0(state);
       }
     }
-    var TypeParameters$0 = $S(__, $EXPECT($L16, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, $EXPECT($L0, fail, 'TypeParameters ","'), __, Type)), $E($S(__, $EXPECT($L0, fail, 'TypeParameters ","'))), __, $EXPECT($L67, fail, 'TypeParameters ">"'));
+    var TypeParameters$0 = $TS($S(__, $EXPECT($L16, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, $EXPECT($L0, fail, 'TypeParameters ","'), __, Type)), $E($S(__, $EXPECT($L0, fail, 'TypeParameters ","'))), __, $EXPECT($L67, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+      return { ts: true, children: $0 };
+    });
     function TypeParameters(state) {
       if (state.verbose)
         console.log("ENTER:", "TypeParameters");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {
@@ -36,6 +36,7 @@
     "esbuild-coffeescript": "^2.1.0",
     "mocha": "^10.0.0",
     "ts-node": "^10.9.1",
+    "tslib": "^2.4.0",
     "typescript": "^4.7.4"
   },
   "mocha": {