tree-sitter-beancount 2.4.2 → 2.5.0

package/grammar.js

@@ -9,6 +9,7 @@ module.exports = grammar({
     word: ($) => $.identifier,
 
     inline: ($) => [
+        $.currency_key_value,
     ],
 
     conflicts: ($) => [
@@ -82,11 +83,13 @@ module.exports = grammar({
         date: $ => token(/([12]\d{3}[-\/](0[1-9]|1[0-2])[-\/](0[1-9]|[12]\d|3[01]))/),
         // Account names: Assets|Liabilities|Equity|Income|Expenses followed by colon-separated components
         // Components can contain Unicode letters/numbers including CJK characters
+        // account: $ => $.identifier, // token(/[^\s\\ \n\r]/),
+
         account: $ =>
             token(
                 seq(
-                    /Assets|Liabilities|Equity|Income|Expenses/,
-                    repeat1(
+                    /[A-Z][\p{L}\p{N}\u3040-\u309f\u30a0-\u30ff\u4e00-\u9fff\uac00-\ud7a3]*/,
+                    repeat(
                         seq(
                             ":",
                             /[\p{Lu}\p{N}\u3040-\u309f\u30a0-\u30ff\u4e00-\u9fff\uac00-\ud7a3][\p{L}\p{N}\u3040-\u309f\u30a0-\u30ff\u4e00-\u9fff\uac00-\ud7a3\-]*/,
@@ -96,6 +99,7 @@ module.exports = grammar({
             ),
         currency: $ => token(/[A-Z]([A-Z0-9\'\._\-]{0,22}[A-Z0-9])?/),
         string: $ => token(/"([^"]|\\")*"/),
+        unquoted_string: $ => token(prec(-1, /[^\r\n]+/)),
         number: $ => token(/([0-9]+|[0-9][0-9,]+[0-9])(\.[0-9]*)?/),
         tag: $ => token(/#[A-Za-z0-9\-_/.]+/),
         link: $ => token(/\^[A-Za-z0-9\-_/.]+/),
@@ -219,17 +223,11 @@ module.exports = grammar({
                 $.flag,
             ),
 
-        price_annotation: $ => $.incomplete_amount,
-        //choice(
-        //    seq(
-        //        $.atat,
-        //        $.incomplete_amount
-        //    ),
-        //    seq(
-        //        $.at,
-        //        $.incomplete_amount
-        //    )
-        //),
+        price_annotation: $ =>
+            choice(
+                $.incomplete_amount,
+                $.currency
+            ),
 
         posting: $ =>
             seq(
@@ -250,25 +248,49 @@ module.exports = grammar({
 
         key: $ => token(/[a-z][a-zA-Z0-9\-_]+/),
 
+        currency_key_value: $ =>
+            prec.left(seq(
+                alias("currency", $.key),
+                ":",
+                optional(
+                    seq(
+                        repeat(/ /),
+                        field("value", alias($.value_currency, $.value)),
+                    )
+                ),
+            )),
+
         value: $ =>
-            choice(
+            prec.left(choice(
                 $.string,
-                $.account,
                 $.date,
                 $.currency,
+                $.account,
                 $.tag,
                 $.bool,
                 $._none,
                 $._number_expr,
-                $.amount
-            ),
+                $.amount,
+                $.string,
+                $.unquoted_string,
+            )),
+
+        value_currency: $ => seq($.currency),
 
         key_value: $ =>
-            prec.left(seq(
-                $.key,
-                ":",
-                $.value,
-            )),
+            choice(
+                $.currency_key_value,
+                prec.left(seq(
+                    $.key,
+                    ":",
+                    optional(
+                        seq(
+                            repeat(/ /),
+                            $.value,
+                        ),
+                    ),
+                )),
+            ),
 
         _key_value_line: $ => seq(
             $._indent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-beancount",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "description": "a tree-sitter parser for the beancount syntax",
   "main": "bindings/node",
   "types": "bindings/node",
@@ -35,7 +35,7 @@
   "dependencies": {
     "node-addon-api": "^8.5.0",
     "node-gyp-build": "^4.8.0",
-    "tar-fs": "^2.1.4"
+    "tar-fs": "^3.1.1"
   },
   "peerDependencies": {
     "tree-sitter": "^0.25.0"
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "prebuildify": "^6.0.0",
-    "tree-sitter-cli": "^0.25.9"
+    "tree-sitter-cli": "^0.26.3"
   },
   "engines": {
     "node": ">=22.0.0"

package/src/grammar.json

@@ -228,10 +228,10 @@
         "members": [
           {
             "type": "PATTERN",
-            "value": "Assets|Liabilities|Equity|Income|Expenses"
+            "value": "[A-Z][\\p{L}\\p{N}\\u3040-\\u309f\\u30a0-\\u30ff\\u4e00-\\u9fff\\uac00-\\ud7a3]*"
           },
           {
-            "type": "REPEAT1",
+            "type": "REPEAT",
             "content": {
               "type": "SEQ",
               "members": [
@@ -263,6 +263,17 @@
         "value": "\"([^\"]|\\\\\")*\""
       }
     },
+    "unquoted_string": {
+      "type": "TOKEN",
+      "content": {
+        "type": "PREC",
+        "value": -1,
+        "content": {
+          "type": "PATTERN",
+          "value": "[^\\r\\n]+"
+        }
+      }
+    },
     "number": {
       "type": "TOKEN",
       "content": {
@@ -698,8 +709,17 @@
       ]
     },
     "price_annotation": {
-      "type": "SYMBOL",
-      "name": "incomplete_amount"
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "incomplete_amount"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "currency"
+        }
+      ]
     },
     "posting": {
       "type": "SEQ",
@@ -835,68 +855,173 @@
         "value": "[a-z][a-zA-Z0-9\\-_]+"
       }
     },
-    "value": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "string"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "account"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "date"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "currency"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "tag"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "bool"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_none"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_number_expr"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "amount"
-        }
-      ]
-    },
-    "key_value": {
+    "currency_key_value": {
       "type": "PREC_LEFT",
       "value": 0,
       "content": {
         "type": "SEQ",
         "members": [
           {
-            "type": "SYMBOL",
-            "name": "key"
+            "type": "ALIAS",
+            "content": {
+              "type": "STRING",
+              "value": "currency"
+            },
+            "named": true,
+            "value": "key"
           },
           {
             "type": "STRING",
             "value": ":"
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "REPEAT",
+                    "content": {
+                      "type": "PATTERN",
+                      "value": " "
+                    }
+                  },
+                  {
+                    "type": "FIELD",
+                    "name": "value",
+                    "content": {
+                      "type": "ALIAS",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "value_currency"
+                      },
+                      "named": true,
+                      "value": "value"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "value": {
+      "type": "PREC_LEFT",
+      "value": 0,
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "string"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "date"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "currency"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "account"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "tag"
+          },
           {
             "type": "SYMBOL",
-            "name": "value"
+            "name": "bool"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "_none"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "_number_expr"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "amount"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "string"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "unquoted_string"
           }
         ]
       }
     },
+    "value_currency": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "currency"
+        }
+      ]
+    },
+    "key_value": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "currency_key_value"
+        },
+        {
+          "type": "PREC_LEFT",
+          "value": 0,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "key"
+              },
+              {
+                "type": "STRING",
+                "value": ":"
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "REPEAT",
+                        "content": {
+                          "type": "PATTERN",
+                          "value": " "
+                        }
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "value"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    },
     "_key_value_line": {
       "type": "SEQ",
       "members": [
@@ -2417,7 +2542,9 @@
       "name": "_eof"
     }
   ],
-  "inline": [],
+  "inline": [
+    "currency_key_value"
+  ],
   "supertypes": [
     "_entry",
     "_directive"

package/src/node-types.json

@@ -773,7 +773,18 @@
   {
     "type": "key_value",
     "named": true,
-    "fields": {},
+    "fields": {
+      "value": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "value",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": true,
@@ -1216,6 +1227,10 @@
       "multiple": false,
       "required": true,
       "types": [
+        {
+          "type": "currency",
+          "named": true
+        },
         {
           "type": "incomplete_amount",
           "named": true
@@ -1553,6 +1568,10 @@
         {
           "type": "unary_number_expr",
           "named": true
+        },
+        {
+          "type": "unquoted_string",
+          "named": true
         }
       ]
     }
@@ -1745,6 +1764,10 @@
     "type": "txn",
     "named": false
   },
+  {
+    "type": "unquoted_string",
+    "named": true
+  },
   {
     "type": "{",
     "named": false