tree-sitter-beancount 2.1.0 → 2.1.3

package/grammar.js

@@ -6,7 +6,7 @@ module.exports = grammar({
     name: "beancount",
 
     // Ensure we don't extract keywords from tokens
-    //word: ($) => $.identifier,
+    word: ($) => $.identifier,
 
     inline: ($) => [
     ],
@@ -24,6 +24,11 @@ module.exports = grammar({
         /( |\r|\t)+/,
     ],
 
+    supertypes: $ => [
+        $._entry,
+        $._directive,
+    ],
+
     rules: {
         file: $ => repeat(
             choice(
@@ -63,57 +68,27 @@ module.exports = grammar({
         /* Types for terminal symbols */
         _indent: $ => token(/[ \r\t]+/),
         _eol: $ => token(/\n/),
-        _pipe: $ => token('|'),
         atat: $ => token('@@'),
         at: $ => token('@'),
-        lcurllcurl: $ => token('{{'),
-        rcurlrcurl: $ => token('}}'),
-        lcurl: $ => token('{'),
-        rcurl: $ => token('}'),
-        _equal: $ => token('='),
-        _comma: $ => token(','),
-        _tilde: $ => token('~'),
-        _hash: $ => token('#'),
         asterisk: $ => token('*'),
         slash: $ => token('/'),
-        _colon: $ => token(':'),
         plus: $ => token('+'),
         minus: $ => token('-'),
-        _lparen: $ => token('('),
-        _rparen: $ => token(')'),
         flag: $ => token(/[!&?%PSTCURM*#]/),
-        TXN: $ => token('txn'),
-        BALANCE: $ => token('balance'),
-        OPEN: $ => token('open'),
-        CLOSE: $ => token('close'),
-        COMMODITY: $ => token('commodity'),
-        PAD: $ => token('pad'),
-        EVENT: $ => token('event'),
-        PRICE: $ => token('price'),
-        NOTE: $ => token('note'),
-        DOCUMENT: $ => token('document'),
-        QUERY: $ => token('query'),
-        CUSTOM: $ => token('custom'),
-        PUSHTAG: $ => token('pushtag'),
-        POPTAG: $ => token('poptag'),
-        PUSHMETA: $ => token('pushmeta'),
-        POPMETA: $ => token('popmeta'),
-        OPTION: $ => token('option'),
-        INCLUDE: $ => token('include'),
-        PLUGIN: $ => token('plugin'),
         _none: $ => token('NULL'),
         bool: $ => token(/TRUE|FALSE/),
         date: $ => token(/([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))/),
+        //An account name is a colon-separated list of capitalized words which begin with a letter, and whose first word must be one of five account types:
+        //Each component of the account names begin with a capital letter or a number and are followed by letters, numbers or dash (-) characters.
+        //All other characters are disallowed.
         account: $ =>
             token(
                 seq(
-                    /[A-Z]|[^\x00-\x7F]/,
-                    repeat(/[A-Za-z0-9\-]|[^\x00-\x7F]/),
+                    /Assets|Liabilities|Equity|Income|Expenses/,
                     repeat1(
                         seq(
                             ":",
-                            /[A-Z0-9]|[^\x00-\x7F]/,
-                            repeat(/[A-Za-z0-9\-]|[^\x00-\x7F]/),
+                            /[\p{Lu}\p{N}][\p{L}\p{N}\-]*/,
                         ),
                     ),
                 ),
@@ -123,7 +98,6 @@ module.exports = grammar({
         number: $ => token(/([0-9]+|[0-9][0-9,]+[0-9])(\.[0-9]*)?/),
         tag: $ => token(/#[A-Za-z0-9\-_/.]+/),
         link: $ => token(/\^[A-Za-z0-9\-_/.]+/),
-        key: $ => token(/[a-z][a-zA-Z0-9\-_]+/),
 
         /* Operator precedence.
          * This is pulled straight out of the textbook example:
@@ -141,10 +115,10 @@ module.exports = grammar({
         /* Grammar Rules */
 
         txn: $ => choice(
-            $.TXN,
+            "txn",
             $.flag,
-            $.asterisk,
-            $._hash
+            "*",
+            "#"
         ),
 
         _number_expr: $ =>
@@ -156,9 +130,9 @@ module.exports = grammar({
             ),
         _paren__number_expr: $ =>
             seq(
-                $._lparen,
+                "(",
                 $._number_expr,
-                $._rparen,
+                ")",
             ),
         unary_number_expr: $ =>
             prec(3,
@@ -192,10 +166,13 @@ module.exports = grammar({
             ),
 
         // OPTIONAL
-        txn_strings: $ =>
-            seq(
-                $.string,
-                optional($.string),
+        _txn_strings: $ =>
+            choice(
+                seq(
+                    alias($.string, $.payee),
+                    alias($.string, $.narration),
+                ),
+                alias($.string, $.narration),
             ),
 
         // OPTIONAL
@@ -214,18 +191,40 @@ module.exports = grammar({
             seq(
                 field("date", $.date),
                 field("txn", $.txn),
-                field("txn_strings", optional($.txn_strings)),
+                optional($._txn_strings),
                 field("tags_links", optional($.tags_links)),
                 field("comment", optional($.comment)),
                 $._eol,
-                field("posting_or_kv_list", optional($.posting_or_kv_list)),
+                optional(
+                    repeat1(
+                        choice(
+                            seq(
+                                $._indent,
+                                $._eol
+                            ),
+                            seq(
+                                $._indent,
+                                $.tags_links,
+                                $._eol
+                            ),
+                            $._key_value_line,
+                            $.posting,
+                            seq(
+                                $._indent,
+                                $.comment,
+                                $._eol
+                            )
+                        )
+                    ),
+                ),
+
             ),
 
         // OPTIONAL
         optflag: $ =>
             choice(
-                $.asterisk,
-                $._hash,
+                "*",
+                "#",
                 $.flag,
             ),
 
@@ -241,8 +240,6 @@ module.exports = grammar({
         //    )
         //),
 
-        //account: $ => $.ACCOUNT,
-
         posting: $ =>
             choice(
                 seq(
@@ -286,21 +283,9 @@ module.exports = grammar({
                 )
             ),
 
-        key_value: $ =>
-            prec.left(seq(
-                $.key,
-                $._colon,
-                optional($._key_value_value),
-            )),
-
-        key_value_line: $ => seq(
-            $._indent,
-            $.key_value,
-            $._eol
-        ),
+        key: $ => token(/[a-z][a-zA-Z0-9\-_]+/),
 
-        // OPTIONAL
-        _key_value_value: $ =>
+        value: $ =>
             choice(
                 $.string,
                 $.account,
@@ -313,31 +298,26 @@ module.exports = grammar({
                 $.amount
             ),
 
-        // OPTIONAL
-        posting_or_kv_list: $ =>
-            repeat1(
-                choice(
-                    seq(
-                        $._indent,
-                        $._eol
-                    ),
-                    seq(
-                        $._indent,
-                        $.tags_links,
-                        $._eol
-                    ),
-                    $.key_value_line,
-                    $.posting,
-                    seq(
-                        $._indent,
-                        $.comment,
-                        $._eol
-                    )
-                )
-            ),
+        key_value: $ =>
+            prec.left(seq(
+                $.key,
+                ":",
+                $.value,
+            )),
+
+        _key_value_line: $ => seq(
+            $._indent,
+            /*prec.left(seq(
+                $.key,
+                ":",
+                $.value,
+            )),*/
+            $.key_value,
+            $._eol
+        ),
 
         // OPTIONAL
-        key_value_list: $ =>
+        _key_value_list: $ =>
             repeat1(
                 choice(
                     seq(
@@ -345,58 +325,58 @@ module.exports = grammar({
                         $._eol
                     ),
                     seq(
-                        $.key_value_line
+                        $._key_value_line
                     )
                 )
             ),
 
         // OPTIONAL
-        currency_list: $ =>
-            seq(
-                $.currency,
-                repeat(
-                    seq(
-                        $._comma,
-                        $.currency
-                    )
-                )
-            ),
 
         pushtag: $ => seq(
-            alias($.PUSHTAG, "pushtag"),
+            "pushtag",
             $.tag,
             $._eol
         ),
 
         poptag: $ => seq(
-            alias($.POPTAG, "poptag"),
+            "poptag",
             $.tag,
             $._eol
         ),
 
         pushmeta: $ => seq(
-            alias($.PUSHMETA, "pushmeta"),
+            "pushmeta",
             $.key_value,
             $._eol
         ),
 
         popmeta: $ => seq(
-            alias($.POPMETA, "popmeta"),
+            "popmeta",
             $.key,
-            $._colon,
+            ":",
             $._eol
         ),
 
         open: $ =>
             seq(
                 field("date", $.date),
-                alias($.OPEN, "open"),
+                "open",
                 field("account", $.account),
-                field("currencies", repeat($.currency_list)),
+                field("currencies", repeat(
+                    seq(
+                        $.currency,
+                        repeat(
+                            seq(
+                                ",",
+                                $.currency
+                            )
+                        )
+                    ),
+                )),
                 field("opt_booking", optional($.opt_booking)),
                 field("comment", optional($.comment)),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         // OPTIONAL
@@ -405,38 +385,38 @@ module.exports = grammar({
         close: $ =>
             seq(
                 field("date", $.date),
-                alias($.CLOSE, "close"),
+                "close",
                 field("account", $.account),
                 field("comment", optional($.comment)),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         commodity: $ =>
             seq(
                 field("date", $.date),
-                alias($.COMMODITY, "commodity"),
+                "commodity",
                 field("currency", $.currency),
                 field("comment", optional($.comment)),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         pad: $ =>
             seq(
                 field("date", $.date),
-                alias($.PAD, "pad"),
+                "pad",
                 field("account", $.account),
                 field("from_account", $.account),
                 field("comment", optional($.comment)),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         balance: $ =>
             seq(
                 field("date", $.date),
-                alias($.BALANCE, "balance"),
+                "balance",
                 field("account", $.account),
                 field("amount",
                     //choice(
@@ -446,7 +426,7 @@ module.exports = grammar({
                 ),
                 field("comment", optional($.comment)),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         amount: $ =>
@@ -463,7 +443,7 @@ module.exports = grammar({
                 ),
                 seq(
                     $._number_expr,
-                    $._tilde,
+                    "~",
                     $._number_expr,
                     $.currency
                 )
@@ -487,7 +467,7 @@ module.exports = grammar({
                 ),
                 seq(
                     field("per", optional($._number_expr)),
-                    $._hash,
+                    "#",
                     field("total", optional($._number_expr)),
                     field("currency", $.currency)
                 ),
@@ -505,24 +485,24 @@ module.exports = grammar({
         cost_spec: $ =>
             choice(
                 seq(
-                    $.lcurl,
-                    field("cost_comp_list", optional($.cost_comp_list)),
-                    $.rcurl
+                    "{",
+                    field("cost_comp_list", optional($._cost_comp_list)),
+                    "}"
                 ),
                 seq(
-                    $.lcurllcurl,
-                    field("cost_comp_list", optional($.cost_comp_list)),
-                    $.rcurlrcurl
+                    "{{",
+                    field("cost_comp_list", optional($._cost_comp_list)),
+                    "}}"
                 ),
             ),
 
         // OPTIONAL
-        cost_comp_list: $ =>
+        _cost_comp_list: $ =>
             seq(
                 $.cost_comp,
                 repeat(
                     seq(
-                        $._comma,
+                        ",",
                         $.cost_comp
                     )
                 )
@@ -533,47 +513,47 @@ module.exports = grammar({
                 $.compound_amount,
                 $.date,
                 $.string,
-                $.asterisk
+                "*"
             ),
 
         price: $ =>
             seq(
                 field("date", $.date),
-                alias($.PRICE, "price"),
+                "price",
                 field("currency", $.currency),
                 field("amount", $.amount),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         event: $ =>
             seq(
                 field("date", $.date),
-                alias($.EVENT, "event"),
+                "event",
                 field("type", $.string),
                 field("desc", $.string),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         query: $ =>
             seq(
                 field("date", $.date),
-                alias($.QUERY, "query"),
+                "query",
                 field("name", $.string),
                 field("query", $.string),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         note: $ =>
             seq(
                 field("date", $.date),
-                alias($.NOTE, "note"),
+                "note",
                 field("account", $.account),
                 field("note", $.string),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         filename: $ => $.string,
@@ -581,12 +561,12 @@ module.exports = grammar({
         document: $ =>
             seq(
                 field("date", $.date),
-                alias($.DOCUMENT, "document"),
+                "document",
                 field("account", $.account),
                 field("filename", $.filename),
                 field("tags_links", optional($.tags_links)),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         custom_value: $ =>
@@ -599,19 +579,19 @@ module.exports = grammar({
                 $.account
             ),
 
-        custom_value_list: $ =>
-            repeat1(
-                $.custom_value
-            ),
 
         custom: $ =>
             seq(
                 field("date", $.date),
-                alias($.CUSTOM, "custom"),
+                "custom",
                 field("name", $.string),
-                field("custom_value_list", optional($.custom_value_list)),
+                field("custom_value_list", optional(
+                    repeat1(
+                        $.custom_value
+                    ),
+                )),
                 $._eol,
-                optional($.key_value_list)
+                optional($._key_value_list)
             ),
 
         _entry: $ =>
@@ -631,14 +611,14 @@ module.exports = grammar({
             ),
 
         option: $ => seq(
-            alias($.OPTION, "option"),
+            "option",
             field("key", $.string),
             field("value", $.string),
             $._eol,
         ),
 
         include: $ => seq(
-            alias($.INCLUDE, "include"),
+            "include",
             $.string,
             $._eol,
         ),
@@ -646,12 +626,12 @@ module.exports = grammar({
         plugin: $ =>
             choice(
                 seq(
-                    alias($.PLUGIN, "plugin"),
+                    "plugin",
                     $.string,
                     $._eol
                 ),
                 seq(
-                    alias($.PLUGIN, "plugin"),
+                    "plugin",
                     $.string,
                     $.string,
                     $._eol
@@ -681,7 +661,7 @@ module.exports = grammar({
         comment: $ => seq(';', /.*/),
 
         // NOTE: includes reserved identifiers
-        identifier: $ => /[_a-zA-Z0-9]+/,
+        identifier: $ => /[a-z]+/,
 
         _skipped_lines: $ =>
             choice(
@@ -691,7 +671,7 @@ module.exports = grammar({
                     $._eol
                 ),
                 seq(
-                    $._colon,
+                    ":",
                     /.*/,
                     $._eol
                 ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-beancount",
-  "version": "2.1.0",
+  "version": "2.1.3",
   "description": "a tree-sitter parser for the beancount syntax",
   "main": "bindings/node",
   "scripts": {
@@ -25,6 +25,6 @@
     "nan": "^2.15.0"
   },
   "devDependencies": {
-    "tree-sitter-cli": "0.20.0"
+    "tree-sitter-cli": "^0.20.0"
   }
 }