@willbooster/tree-sitter-go 2.1.3 → 3.0.0

package/README.md

@@ -5,7 +5,7 @@
 [![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.11-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.41.8-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
@@ -14,13 +14,13 @@ to its authors and contributors. This is not an official release of that project
 
 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
+number (`0x57420006`), so it loads only with the WillBooster runtime, version 7.0.5 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 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, 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';
@@ -66,8 +66,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2" }
-tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "2" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter-go = { package = "willbooster-tree-sitter-go", version = "3" }
 ```
 
 ```rust

package/grammar.js

@@ -85,15 +85,17 @@ module.exports = grammar({
   word: $ => $.identifier,
 
   conflicts: $ => [
+    [$._generic_function, $._expression],
+    [$._generic_function, $._simple_type, $._expression],
+    [$._generic_function, $._simple_type, $.generic_type, $._expression],
+    [$._generic_function, $.type_parameter_declaration, $._simple_type, $.generic_type, $._expression],
     [$._simple_type, $._expression],
-    [$._simple_type, $.generic_type, $._expression],
     [$.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],
   ],
 
   reserved: {
@@ -690,14 +692,26 @@ module.exports = grammar({
       ')',
     ),
 
+    _generic_function: $ => choice(
+      $.identifier,
+      $.selector_expression,
+      alias($._parenthesized_generic_function, $.parenthesized_expression),
+    ),
+
+    _parenthesized_generic_function: $ => seq('(', $._generic_function, ')'),
+
     call_expression: $ => prec(PREC.primary, choice(
       seq(
         field('function', alias(choice('new', 'make'), $.identifier)),
         field('arguments', alias($.special_argument_list, $.argument_list)),
       ),
+      seq(
+        field('function', $._generic_function),
+        field('type_arguments', prec.dynamic(2, $.type_arguments)),
+        field('arguments', $.argument_list),
+      ),
       seq(
         field('function', $._expression),
-        field('type_arguments', optional($.type_arguments)),
         field('arguments', $.argument_list),
       ),
     )),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-go",
-  "version": "2.1.3",
+  "version": "3.0.0",
   "description": "Go grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -47,21 +47,20 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.26.1",
-    "@willbooster/web-tree-sitter": "2.0.25",
+    "@willbooster/web-tree-sitter": "7.0.5",
     "conventional-changelog-conventionalcommits": "10.4.1",
     "lefthook": "2.2.1",
     "oxfmt": "0.72.0",
     "oxlint": "1.87.0",
-    "oxlint-tsgolint": "7.0.2003",
+    "oxlint-tsgolint": "7.0.2004",
     "playwright": "1.64.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "typescript": "7.0.2",
     "vitest": "5.0.3",
     "wrangler": "4.149.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^2.0.0"
+    "@willbooster/web-tree-sitter": "^7.0.5"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/tree-sitter.json

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