@willbooster/tree-sitter-go 1.0.0 → 2.1.0

package/README.md

@@ -1,23 +1,26 @@
 # @willbooster/tree-sitter-go
 
+[![npm version](https://img.shields.io/npm/v/@willbooster/tree-sitter-go.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-go)
+[![license](https://img.shields.io/npm/l/@willbooster/tree-sitter-go.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-go)
 [![Test](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-go/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.36.6-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.36.11-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-go.svg)](https://crates.io/crates/willbooster-tree-sitter-go)
 
 Go grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
 [tree-sitter/tree-sitter-go](https://github.com/tree-sitter/tree-sitter-go). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork keeps the grammar of upstream's version 0.25.0 and generates the parser with the
-[WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator at ABI 16, whose compact parse tables
-need that fork's runtime.
+This fork extends upstream's version 0.25.0 grammar with method type parameters and generates the parser with the
+[WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parser carries that fork's own ABI
+number (`0x57420001`), so it loads only with the WillBooster runtime, version 2.0.0 or later
+(`willbooster-tree-sitter`, `@willbooster/web-tree-sitter`), and not with upstream's tree-sitter.
 
 ## Usage
 
 The npm package ships `tree-sitter-go.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 1.4.3 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 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:
 
 ```js
 import { fileURLToPath } from 'node:url';
@@ -63,8 +66,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "1.4.3" }
-tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "1" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "2" }
+tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "2" }
 ```
 
 ```rust
@@ -90,7 +93,7 @@ not the ones this package ships with. Its first run downloads that CLI from the
 with `cargo` (whose build runs the CMake that `mise.toml` pins) when the download fails or the release has no binary that runs here. Run other CLI commands through it as
 well (e.g. `script/tree-sitter parse file.go`).
 
-`bun run generate` records a fresh ABI 16 generation profile from the applicable `test/corpus` cases and Git-tracked
+`bun run generate` records a fresh generation profile from the applicable `test/corpus` cases and Git-tracked
 files in `examples/`, then generates compact parser tables. The parser also embeds metadata from `tree-sitter.json`. After changing a grammar,
 `tree-sitter.json`, a corpus case, or a tracked example,
 regenerate and commit `src/`. Stage added or removed examples with `git add -A examples` before generation so the profile uses the intended file list.

package/grammar.js

@@ -90,6 +90,7 @@ module.exports = grammar({
     [$.qualified_type, $._expression],
     [$.generic_type, $._simple_type],
     [$.parameter_declaration, $._simple_type],
+    [$.type_parameter_declaration, $._simple_type],
     [$.type_parameter_declaration, $._simple_type, $._expression],
     [$.type_parameter_declaration, $._expression],
     [$.type_parameter_declaration, $._simple_type, $.generic_type, $._expression],
@@ -231,6 +232,7 @@ module.exports = grammar({
       'func',
       field('receiver', $.parameter_list),
       field('name', $._field_identifier),
+      field('type_parameters', optional($.type_parameter_list)),
       field('parameters', $.parameter_list),
       field('result', optional(choice($.parameter_list, $._simple_type))),
       field('body', optional($.block)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-go",
-  "version": "1.0.0",
+  "version": "2.1.0",
   "description": "Go 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.24.0",
-    "@willbooster/web-tree-sitter": "1.5.1",
+    "@willbooster/web-tree-sitter": "2.0.1",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.16",
     "oxfmt": "0.71.0",
@@ -61,7 +61,7 @@
     "wrangler": "4.147.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^1.4.3"
+    "@willbooster/web-tree-sitter": "^2.0.0"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/src/node-types.json

@@ -1633,6 +1633,16 @@
             "named": true
           }
         ]
+      },
+      "type_parameters": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type_parameter_list",
+            "named": true
+          }
+        ]
       }
     }
   },

package/tree-sitter.json

@@ -14,7 +14,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.0",
+    "version": "2.1.0",
     "license": "MIT",
     "description": "Go grammar for tree-sitter",
     "authors": [