tree-sitter-beancount 2.3.1 → 2.3.3

package/.github/dependabot.yml

@@ -1,11 +1,26 @@
 version: 2
 updates:
-  - package-ecosystem: github-actions
+  - package-ecosystem: "cargo"
     directory: "/"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+      interval: "weekly"
     commit-message:
-      prefix: "chore:"
+      prefix: "chore(deps):"
     labels:
-      - dependabot
+      - "dependencies"
+      - "cargo"
+    groups:
+      cargo:
+        patterns: ["*"]
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "ci:"
+    labels:
+      - "dependencies"
+      - "github-actions"
+    groups:
+      actions:
+        patterns: ["*"]

package/.github/workflows/cicd.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: '18'
 

package/.github/workflows/release.yml

@@ -59,7 +59,7 @@ jobs:
       - name: Checking out sources
         uses: actions/checkout@v4
       - name: Set up Node
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: '16'
           registry-url: 'https://registry.npmjs.org'

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.3.3](https://github.com/polarmutex/tree-sitter-beancount/compare/v2.3.2...v2.3.3) (2024-07-20)
+
+
+### Bug Fixes
+
+* support comments as part of key value lists ([c25f803](https://github.com/polarmutex/tree-sitter-beancount/commit/c25f8034c977681653a8acd541c8b4877a58f474))
+* support embedded escaped quotes in strings ([9f6eb73](https://github.com/polarmutex/tree-sitter-beancount/commit/9f6eb73b2cc06325f6c31f9c58f84ba802a88fd0))
+
+## [2.3.2](https://github.com/polarmutex/tree-sitter-beancount/compare/v2.3.1...v2.3.2) (2024-03-09)
+
+
+### Bug Fixes
+
+* binding and lock files for rust ([0727d62](https://github.com/polarmutex/tree-sitter-beancount/commit/0727d62af0dea0a78bbf132f53876888fc656c19))
+* fix other scanner.cc references ([1f19abf](https://github.com/polarmutex/tree-sitter-beancount/commit/1f19abf1e162e1828013cb5434c6cf30f4054e80))
+
 ## [2.3.1](https://github.com/polarmutex/tree-sitter-beancount/compare/v2.3.0...v2.3.1) (2024-02-29)
 
 

package/Cargo.lock

@@ -4,30 +4,42 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -36,15 +48,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "tree-sitter"
-version = "0.20.9"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4423c784fe11398ca91e505cdc71356b07b1a924fc8735cfab5333afe3e18bc"
+checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca"
 dependencies = [
  "cc",
  "regex",
@@ -52,7 +64,7 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-beancount"
-version = "2.1.1"
+version = "2.3.2"
 dependencies = [
  "cc",
  "tree-sitter",

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-beancount"
 description = "beancount grammar for the tree-sitter parsing library"
-version = "2.3.1" # {x-release-please-version}
+version = "2.3.2" # {x-release-please-version}
 keywords = ["incremental", "parsing", "beancount", "tree-sitter"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/polarmutex/tree-sitter-beancount"
@@ -20,7 +20,7 @@ include = [
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "~0.20.0"
+tree-sitter = "~0.22.6"
 
 [build-dependencies]
 cc = "1.0"

package/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
                 path: ".",
                 sources: [
                     "src/parser.c",
-                    "src/scanner.cc",
+                    "src/scanner.c",
                 ],
                 publicHeadersPath: "bindings/swift",
                 cSettings: [.headerSearchPath("src")])

package/binding.gyp

@@ -10,6 +10,7 @@
         "bindings/node/binding.cc",
         # If your language uses an external scanner, add it here.
         "src/parser.c",
+        # "src/scanner.c",
       ],
       "cflags_c": [
         "-std=c99",

package/bindings/rust/build.rs

@@ -6,18 +6,17 @@ fn main() {
     c_config
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-but-set-variable")
-        .flag_if_supported("-Wno-trigraphs");
+        .flag_if_supported("-Wno-trigraphs")
+        .flag_if_supported("-O");
     let parser_path = src_dir.join("parser.c");
     c_config.file(&parser_path);
 
     // If your language uses an external scanner written in C,
     // then include this block of code:
 
-    /*
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
 
     c_config.compile("parser");
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());

package/flake.nix

@@ -84,6 +84,7 @@
               nodePackages.node-gyp
               # broken (tree-sitter.override {webUISupport = true;})
               tree-sitter
+              cargo
             ];
 
             inherit (checks.pre-commit) shellHook;

package/grammar.js

@@ -94,7 +94,7 @@ module.exports = grammar({
                 ),
             ),
         currency: $ => token(/[A-Z][A-Z0-9\'\._\-]{0,22}[A-Z0-9]/),
-        string: $ => token(/"[^"]*"/),
+        string: $ => token(/"([^"]|\\")*"/),
         number: $ => token(/([0-9]+|[0-9][0-9,]+[0-9])(\.[0-9]*)?/),
         tag: $ => token(/#[A-Za-z0-9\-_/.]+/),
         link: $ => token(/\^[A-Za-z0-9\-_/.]+/),
@@ -211,7 +211,7 @@ module.exports = grammar({
                             $.posting,
                             seq(
                                 $._indent,
-                                $.comment,
+                                field("comment", $.comment),
                                 $._eol
                             )
                         )
@@ -326,7 +326,12 @@ module.exports = grammar({
                     ),
                     seq(
                         $._key_value_line
-                    )
+                    ),
+                    seq(
+                        $._indent,
+                        field("comment", $.comment),
+                        $._eol
+                    ),
                 )
             ),
 
@@ -522,6 +527,7 @@ module.exports = grammar({
                 "price",
                 field("currency", $.currency),
                 field("amount", $.amount),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -532,6 +538,7 @@ module.exports = grammar({
                 "event",
                 field("type", $.string),
                 field("desc", $.string),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -542,6 +549,7 @@ module.exports = grammar({
                 "query",
                 field("name", $.string),
                 field("query", $.string),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -552,6 +560,7 @@ module.exports = grammar({
                 "note",
                 field("account", $.account),
                 field("note", $.string),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -565,6 +574,7 @@ module.exports = grammar({
                 field("account", $.account),
                 field("filename", $.filename),
                 field("tags_links", optional($.tags_links)),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),
@@ -590,6 +600,7 @@ module.exports = grammar({
                         $.custom_value
                     ),
                 )),
+                field("comment", optional($.comment)),
                 $._eol,
                 optional($._key_value_list)
             ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-beancount",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "a tree-sitter parser for the beancount syntax",
   "main": "bindings/node",
   "scripts": {

package/src/grammar.json

@@ -256,7 +256,7 @@
       "type": "TOKEN",
       "content": {
         "type": "PATTERN",
-        "value": "\"[^\"]*\""
+        "value": "\"([^\"]|\\\\\")*\""
       }
     },
     "number": {
@@ -653,8 +653,12 @@
                         "name": "_indent"
                       },
                       {
-                        "type": "SYMBOL",
-                        "name": "comment"
+                        "type": "FIELD",
+                        "name": "comment",
+                        "content": {
+                          "type": "SYMBOL",
+                          "name": "comment"
+                        }
                       },
                       {
                         "type": "SYMBOL",
@@ -1174,6 +1178,27 @@
                 "name": "_key_value_line"
               }
             ]
+          },
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_indent"
+              },
+              {
+                "type": "FIELD",
+                "name": "comment",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "comment"
+                }
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_eol"
+              }
+            ]
           }
         ]
       }
@@ -1920,6 +1945,22 @@
             "name": "amount"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -1969,6 +2010,22 @@
             "name": "string"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2018,6 +2075,22 @@
             "name": "string"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2067,6 +2140,22 @@
             "name": "string"
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2136,6 +2225,22 @@
             ]
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"
@@ -2225,6 +2330,22 @@
             ]
           }
         },
+        {
+          "type": "FIELD",
+          "name": "comment",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "comment"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "SYMBOL",
           "name": "_eol"

package/src/node-types.json

@@ -171,7 +171,7 @@
         ]
       },
       "comment": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -256,7 +256,7 @@
         ]
       },
       "comment": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -297,7 +297,7 @@
     "named": true,
     "fields": {
       "comment": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -453,6 +453,16 @@
     "type": "custom",
     "named": true,
     "fields": {
+      "comment": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "comment",
+            "named": true
+          }
+        ]
+      },
       "custom_value_list": {
         "multiple": true,
         "required": false,
@@ -552,6 +562,16 @@
           }
         ]
       },
+      "comment": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "comment",
+            "named": true
+          }
+        ]
+      },
       "date": {
         "multiple": false,
         "required": true,
@@ -598,6 +618,16 @@
     "type": "event",
     "named": true,
     "fields": {
+      "comment": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "comment",
+            "named": true
+          }
+        ]
+      },
       "date": {
         "multiple": false,
         "required": true,
@@ -782,6 +812,16 @@
           }
         ]
       },
+      "comment": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "comment",
+            "named": true
+          }
+        ]
+      },
       "date": {
         "multiple": false,
         "required": true,
@@ -829,7 +869,7 @@
         ]
       },
       "comment": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -955,7 +995,7 @@
         ]
       },
       "comment": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -1135,6 +1175,16 @@
           }
         ]
       },
+      "comment": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "comment",
+            "named": true
+          }
+        ]
+      },
       "currency": {
         "multiple": false,
         "required": true,
@@ -1216,6 +1266,16 @@
     "type": "query",
     "named": true,
     "fields": {
+      "comment": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "comment",
+            "named": true
+          }
+        ]
+      },
       "date": {
         "multiple": false,
         "required": true,
@@ -1330,7 +1390,7 @@
     "named": true,
     "fields": {
       "comment": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -1394,10 +1454,6 @@
       "multiple": true,
       "required": false,
       "types": [
-        {
-          "type": "comment",
-          "named": true
-        },
         {
           "type": "key_value",
           "named": true