@willbooster/tree-sitter-java 3.1.2 → 5.0.0

package/README.md

@@ -16,13 +16,13 @@ This fork is based on tree-sitter-java 0.23.5 and accepts `final` modifiers on s
 and typed record-pattern components, plus qualified names in record patterns. Unnamed variables in switch and
 `instanceof` type patterns, including typed record-pattern components, use `underscore_pattern` nodes. It ships the
 parser as the compact tables that the [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator
-emits under that fork's own ABI number (`0x57420001`), so the parser loads only with that runtime, version 2.0.0 or
-later, and not with upstream's tree-sitter.
+emits under that fork's own ABI number (`0x57420006`), so the parser loads only with that runtime, version 7.0.5 or
+later within major version 7, and not with upstream's tree-sitter.
 
 ## Usage
 
 The npm package ships `tree-sitter-java.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 2.0.0 or later, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 7.0.5 or later within major version 7, which runs in Node.js, Bun, browsers, and Cloudflare Workers. In Node.js and Bun, load the grammar from its path:
 
 ```js
 import { fileURLToPath } from 'node:url';
@@ -62,14 +62,26 @@ parser.setLanguage(await Language.load(java));
 
 The package also ships `grammar.js`, the queries in `queries/`, and the node types in `src/node-types.json`.
 
+Within a declaration's `modifiers`, access keywords are named `visibility` nodes and other modifier keywords are
+named `modifier` nodes. Annotations retain their own nodes, and the keyword tokens remain available for highlighting.
+For example, this query captures explicitly public static methods without matching annotation text:
+
+```scheme
+(method_declaration
+  (modifiers (visibility) @visibility (modifier) @modifier)
+  name: (identifier) @method
+  (#eq? @visibility "public")
+  (#eq? @modifier "static"))
+```
+
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-java) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
 fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2" }
-tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "2" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter-java = { package = "willbooster-tree-sitter-java", version = "5" }
 ```
 
 ```rust

package/grammar.js

@@ -991,9 +991,13 @@ module.exports = grammar({
 
     modifiers: $ => repeat1(choice(
       $._annotation,
-      'public',
-      'protected',
-      'private',
+      $.visibility,
+      $.modifier,
+    )),
+
+    visibility: _ => choice('public', 'protected', 'private'),
+
+    modifier: _ => choice(
       'abstract',
       'static',
       'final',
@@ -1005,7 +1009,7 @@ module.exports = grammar({
       'volatile',
       'sealed',
       'non-sealed',
-    )),
+    ),
 
     type_parameters: $ => seq(
       '<', commaSep1($.type_parameter), '>',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-java",
-  "version": "3.1.2",
+  "version": "5.0.0",
   "description": "Java grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -47,7 +47,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.26.1",
-    "@willbooster/web-tree-sitter": "2.0.1",
+    "@willbooster/web-tree-sitter": "7.0.5",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.2.1",
     "oxfmt": "0.72.0",
@@ -60,7 +60,7 @@
     "wrangler": "4.147.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^2.0.0"
+    "@willbooster/web-tree-sitter": "^7.0.5"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/src/node-types.json

@@ -2707,13 +2707,18 @@
       ]
     }
   },
+  {
+    "type": "modifier",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "modifiers",
     "named": true,
     "fields": {},
     "children": {
       "multiple": true,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "annotation",
@@ -2722,6 +2727,14 @@
         {
           "type": "marker_annotation",
           "named": true
+        },
+        {
+          "type": "modifier",
+          "named": true
+        },
+        {
+          "type": "visibility",
+          "named": true
         }
       ]
     }
@@ -4065,6 +4078,11 @@
       }
     }
   },
+  {
+    "type": "visibility",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "while_statement",
     "named": true,

package/tree-sitter.json

@@ -14,7 +14,7 @@
     }
   ],
   "metadata": {
-    "version": "3.1.2",
+    "version": "5.0.0",
     "license": "MIT",
     "description": "Java grammar for tree-sitter",
     "authors": [