npm - tree-sitter-beancount - Versions diffs - 2.1.2 → 2.2.0 - Mend

tree-sitter-beancount 2.1.2 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/.github/dependabot.yml +11 -0
package/.github/workflows/cicd.yml +3 -3
package/.github/workflows/release.yml +4 -4
package/CHANGELOG.md +14 -0
package/Cargo.toml +1 -1
package/LICENSE +21 -0
package/flake.lock +84 -10
package/flake.nix +79 -83
package/grammar.js +3 -3
package/package.json +2 -2
package/src/grammar.json +30 -18
package/src/node-types.json +20 -8
package/src/parser.c +2914 -2269
package/src/scanner.cc +11 -3
package/shell.nix +0 -13

package/.github/dependabot.yml ADDED Viewed

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    commit-message:
+      prefix: "chore:"
+    labels:
+      - dependabot

package/.github/workflows/cicd.yml CHANGED Viewed

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Node
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v3.8.1
         with:
-          node-version: '16'
+          node-version: '18'
       - name: Display Node versions
         run: |

package/.github/workflows/release.yml CHANGED Viewed

@@ -32,9 +32,9 @@ jobs:
           profile: minimal
           override: true
       - name: Checking out sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Cache Cargo
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
@@ -57,9 +57,9 @@ jobs:
     if: needs.release-please.outputs.release_created
     steps:
       - name: Checking out sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Set up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.8.1
         with:
           node-version: '16'
           registry-url: 'https://registry.npmjs.org'

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,19 @@
 # Changelog
+## [2.2.0](https://github.com/polarmutex/tree-sitter-beancount/compare/v2.1.3...v2.2.0) (2023-10-10)
+### Features
+* add named field for narration and payee ([0631b99](https://github.com/polarmutex/tree-sitter-beancount/commit/0631b99d9096e10f4e289efe618e518debe918b4))
+## [2.1.3](https://github.com/polarmutex/tree-sitter-beancount/compare/v2.1.2...v2.1.3) (2023-07-02)
+### Bug Fixes
+* detect in error recovery and exit scan ([f3c05c6](https://github.com/polarmutex/tree-sitter-beancount/commit/f3c05c68aa03631fb4b9f0f7592bfec48376e65a))
 ## [2.1.2](https://github.com/polarmutex/tree-sitter-beancount/compare/v2.1.1...v2.1.2) (2023-01-28)

package/Cargo.toml CHANGED Viewed

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-beancount"
 description = "beancount grammar for the tree-sitter parsing library"
-version = "2.1.2" # {x-release-please-version}
+version = "2.2.0" # {x-release-please-version}
 keywords = ["incremental", "parsing", "beancount", "tree-sitter"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/polarmutex/tree-sitter-beancount"

package/LICENSE ADDED Viewed

@@ -0,0 +1,21 @@
+MIT License
+Copyright (c) 2023 PolarMutex
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/flake.lock CHANGED Viewed

@@ -1,12 +1,31 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1656065134,
-        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -15,13 +34,34 @@
         "type": "github"
       }
     },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656239181,
-        "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
+        "lastModified": 1696604326,
+        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
+        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
         "type": "github"
       },
       "original": {
@@ -31,21 +71,40 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1685801374,
+        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
+        "flake-compat": "flake-compat",
         "flake-utils": [
           "flake-utils"
         ],
+        "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1656169028,
-        "narHash": "sha256-y9DRauokIeVHM7d29lwT8A+0YoGUBXV3H0VErxQeA8s=",
+        "lastModified": 1696846637,
+        "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "db3bd555d3a3ceab208bed48f983ccaa6a71a25e",
+        "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca",
         "type": "github"
       },
       "original": {
@@ -60,6 +119,21 @@
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

package/flake.nix CHANGED Viewed

@@ -13,101 +13,97 @@
     };
   };
-  outputs = { self, nixpkgs, flake-utils, pre-commit-hooks }:
-    { } //
-    flake-utils.lib.eachDefaultSystem
-      (
-        system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = [ self.overlays.default ];
-          };
-          tree-sitter-env = pkgs.stdenv.mkDerivation {
-            name = "tree-sitter-env";
-            nativeBuildInputs = with pkgs; [
-              makeWrapper
-            ];
-            dontUnpack = true;
-            dontBuild = true;
-            installPhase = ''
-              mkdir -p $out/bin
-              makeWrapper \
-                ${pkgs.tree-sitter}/bin/tree-sitter \
-                $out/bin/tree-sitter \
-                --prefix PATH : "${with pkgs; lib.makeBinPath [stdenv.cc nodejs]}"
-            '';
-          };
-        in
-        rec {
-          checks = {
-            pre-commit = pre-commit-hooks.lib.${system}.run {
-              src = ./.;
-              hooks = {
-                clang-format = {
-                  enable = true;
-                  name = "clang-format";
-                  entry = "${pkgs.clang-tools}/bin/clang-format -style=file -i";
-                  types = [ "text" "c" ];
-                  # I don't care for generated files' formatting
-                  excludes = [ "src/parser.c" "src/tree_sitter/parser.h" ];
-                  language = "system";
-                };
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    pre-commit-hooks,
+  }:
+    {}
+    // flake-utils.lib.eachDefaultSystem
+    (
+      system: let
+        pkgs = import nixpkgs {
+          inherit system;
+          #overlays = [self.overlays.default];
+        };
+        tree-sitter-env = pkgs.stdenv.mkDerivation {
+          name = "tree-sitter-env";
+          nativeBuildInputs = with pkgs; [
+            makeWrapper
+          ];
+          dontUnpack = true;
+          dontBuild = true;
+          installPhase = ''
+            mkdir -p $out/bin
+            makeWrapper \
+              ${pkgs.tree-sitter}/bin/tree-sitter \
+              $out/bin/tree-sitter \
+              --prefix PATH : "${with pkgs; lib.makeBinPath [stdenv.cc nodejs]}"
+          '';
+        };
+      in rec {
+        checks = {
+          pre-commit = pre-commit-hooks.lib.${system}.run {
+            src = ./.;
+            hooks = {
+              clang-format = {
+                enable = true;
+                name = "clang-format";
+                entry = "${pkgs.clang-tools}/bin/clang-format -style=file -i";
+                types = ["text" "c"];
+                # I don't care for generated files' formatting
+                excludes = ["src/parser.c" "src/tree_sitter/parser.h"];
+                language = "system";
+              };
-                nixpkgs-fmt = {
-                  enable = true;
-                };
+              alejandra.enable = true;
-                tree-sitter = {
-                  enable = true;
-                  name = "tree-sitter tests";
-                  entry = "${tree-sitter-env}/bin/tree-sitter test";
-                  pass_filenames = false;
-                };
+              tree-sitter = {
+                enable = true;
+                name = "tree-sitter tests";
+                entry = "${tree-sitter-env}/bin/tree-sitter test";
+                pass_filenames = false;
+              };
-                tree-sitter-files = {
-                  enable = true;
-                  name = "tree-sitter generated files";
-                  entry = "${tree-sitter-env}/bin/tree-sitter generate";
-                  pass_filenames = false;
-                };
+              tree-sitter-files = {
+                enable = true;
+                name = "tree-sitter generated files";
+                entry = "${tree-sitter-env}/bin/tree-sitter generate";
+                pass_filenames = false;
               };
             };
           };
+        };
-          devShells = {
-            default = pkgs.mkShell {
-              nativeBuildInputs = with pkgs; [
-                nodejs-16_x
-                python39
-                nodePackages.typescript
-                rustc
-                cargo
-                rustfmt
-                clippy
-                (tree-sitter.override { webUISupport = true; })
-              ];
+        devShells = {
+          default = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [
+              nodejs
+              nodePackages.node-gyp
+              # broken (tree-sitter.override {webUISupport = true;})
+              tree-sitter
+            ];
-              inherit (checks.pre-commit) shellHook;
-            };
+            inherit (checks.pre-commit) shellHook;
           };
+        };
-          packages = {
-            default = packages.tree-sitter-beancount;
-            inherit (pkgs.tree-sitter.passthru.builtGrammars) tree-sitter-beancount;
+        packages = {
+          default = packages.tree-sitter-beancount;
-            inherit (pkgs) tree-sitter;
+          tree-sitter-beancount = pkgs.callPackage (nixpkgs + "/pkgs/development/tools/parsing/tree-sitter/grammar.nix") {} {
+            language = "beancount";
+            src = ./.;
+            inherit (pkgs.tree-sitter) version;
           };
-        }
-      ) // {
+          inherit (pkgs) tree-sitter;
+        };
+      }
+    )
+    // {
       overlays = {
         default = final: prev: {
           tree-sitter = prev.tree-sitter.override {

package/grammar.js CHANGED Viewed

@@ -169,10 +169,10 @@ module.exports = grammar({
         _txn_strings: $ =>
             choice(
                 seq(
-                    alias($.string, $.payee),
-                    alias($.string, $.narration),
+                    field("payee", alias($.string, $.payee)),
+                    field("narration", alias($.string, $.narration)),
                 ),
-                alias($.string, $.narration),
+                field("narration", alias($.string, $.narration)),
             ),
         // OPTIONAL

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-beancount",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "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"
   }
 }

package/src/grammar.json CHANGED Viewed

@@ -474,33 +474,45 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "payee",
               "content": {
-                "type": "SYMBOL",
-                "name": "string"
-              },
-              "named": true,
-              "value": "payee"
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "string"
+                },
+                "named": true,
+                "value": "payee"
+              }
             },
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "narration",
               "content": {
-                "type": "SYMBOL",
-                "name": "string"
-              },
-              "named": true,
-              "value": "narration"
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "string"
+                },
+                "named": true,
+                "value": "narration"
+              }
             }
           ]
         },
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "narration",
           "content": {
-            "type": "SYMBOL",
-            "name": "string"
-          },
-          "named": true,
-          "value": "narration"
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "string"
+            },
+            "named": true,
+            "value": "narration"
+          }
         }
       ]
     },

package/src/node-types.json CHANGED Viewed

@@ -1349,6 +1349,26 @@
           }
         ]
       },
+      "narration": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "narration",
+            "named": true
+          }
+        ]
+      },
+      "payee": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "payee",
+            "named": true
+          }
+        ]
+      },
       "tags_links": {
         "multiple": false,
         "required": false,
@@ -1382,14 +1402,6 @@
           "type": "key_value",
           "named": true
         },
-        {
-          "type": "narration",
-          "named": true
-        },
-        {
-          "type": "payee",
-          "named": true
-        },
         {
           "type": "posting",
           "named": true