tree-sitter-beancount 2.1.2 → 2.1.3

package/.github/dependabot.yml

@@ -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

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

package/.github/workflows/release.yml

@@ -32,9 +32,9 @@ jobs:
           profile: minimal
           override: true
       - name: Checking out sources
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
       - 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@v3
       - name: Set up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.6.0
         with:
           node-version: '16'
           registry-url: 'https://registry.npmjs.org'

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [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

@@ -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.1.3" # {x-release-please-version}
 keywords = ["incremental", "parsing", "beancount", "tree-sitter"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/polarmutex/tree-sitter-beancount"

package/LICENSE

@@ -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

@@ -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": 1687709756,
+        "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
         "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": 1688231357,
+        "narHash": "sha256-ZOn16X5jZ6X5ror58gOJAxPfFLAQhZJ6nOUeS4tfFwo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
+        "rev": "645ff62e09d294a30de823cb568e9c6d68e92606",
         "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": 1688137124,
+        "narHash": "sha256-ramG4s/+A5+t/QG2MplTNPP/lmBWDtbW6ilpwb9sKVo=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "db3bd555d3a3ceab208bed48f983ccaa6a71a25e",
+        "rev": "522fd47af79b66cdd04b92618e65c7a11504650a",
         "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

@@ -13,101 +13,98 @@
     };
   };
 
-  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
+              #python39
+              #nodePackages.typescript
+              #rustc
+              #cargo
+              #rustfmt
+              #clippy
+              (tree-sitter.overrideAttrs (_: {webUISupport = true;}))
+            ];
 
-              inherit (checks.pre-commit) shellHook;
-            };
+            inherit (checks.pre-commit) shellHook;
           };
+        };
 
-          packages = {
-            default = packages.tree-sitter-beancount;
+        packages = {
+          default = packages.tree-sitter-beancount;
 
-            inherit (pkgs.tree-sitter.passthru.builtGrammars) tree-sitter-beancount;
+          inherit (pkgs.tree-sitter.passthru.builtGrammars) tree-sitter-beancount;
 
-            inherit (pkgs) tree-sitter;
-          };
-        }
-      ) // {
+          inherit (pkgs) tree-sitter;
+        };
+      }
+    )
+    // {
       overlays = {
         default = final: prev: {
           tree-sitter = prev.tree-sitter.override {

package/package.json

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