@willbooster/tree-sitter-dart 2.0.0 → 3.0.0

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-dart/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-dart/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-dart/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-dart/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.41.8-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.43.2-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-dart.svg)](https://crates.io/crates/willbooster-tree-sitter-dart)
 
 Dart grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -13,8 +13,8 @@ Dart grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), fork
 to its authors and contributors. This is not an official release of that project.
 
 This fork extends upstream's version 0.2.0 grammar, retains its external scanner, 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 (`0x57420006`), so it loads only with the fork's runtime,
-version 7.0.5 or later in the 7.x series; upstream's runtime rejects it, and the fork's runtime rejects parsers generated by upstream's CLI.
+[WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parser carries that fork's own ABI number (`0x57420007`), so it loads only with the fork's runtime,
+version 10.0.2 or later in the 10.x series; upstream's runtime rejects it, and the fork's runtime rejects parsers generated by upstream's CLI.
 
 ## Differences from upstream's parser
 
@@ -31,7 +31,7 @@ Known differences from upstream's 0.2.0 parser include:
 ## Usage
 
 The npm package ships `tree-sitter-dart.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 7.0.5 or later in the 7.x series, which runs in Node.js, Bun, browsers, and Cloudflare Workers.
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 10.0.2 or later in the 10.x series, which runs in Node.js, Bun, browsers, and Cloudflare Workers.
 In Node.js and Bun, load the grammar from its path:
 
 ```js
@@ -78,8 +78,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
-tree-sitter-dart = { package = "willbooster-tree-sitter-dart", version = "2" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "10.0.2" }
+tree-sitter-dart = { package = "willbooster-tree-sitter-dart", version = "3" }
 ```
 
 ```rust

package/grammar.js

@@ -154,7 +154,6 @@ module.exports = grammar({
     // [$._type_name, $._primary, $.assignable_expression], -- subsumed
     // Parameter ambiguities
     [$._normal_formal_parameters],
-    [$._normal_formal_parameter],
     [$.typed_identifier, $._var_or_type, $._function_formal_parameter],
     [$.record_type_field, $._function_formal_parameter, $._var_or_type],
     [$.record_type_field, $._var_or_type, $._final_var_or_type, $._function_formal_parameter],
@@ -1382,20 +1381,23 @@ module.exports = grammar({
       seq(
         optional($._metadata),
         optional("required"),
-        $.formal_parameter,
+        alias($._unannotated_formal_parameter, $.formal_parameter),
         optional(seq(choice("=", ":"), $._expression)),
       ),
 
     _normal_formal_parameter: ($) =>
       seq(
         optional($._metadata),
+        $._unannotated_formal_parameter,
+      ),
+
+    _unannotated_formal_parameter: ($) =>
         choice(
           $._function_formal_parameter,
           $._simple_formal_parameter,
           $.constructor_param,
           $.super_formal_parameter,
         ),
-      ),
 
     _function_formal_parameter: ($) =>
       seq(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-dart",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Dart grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -42,16 +42,16 @@
   },
   "devDependencies": {
     "@tsconfig/bun": "1.0.11",
-    "@types/bun": "1.4.2",
+    "@types/bun": "1.4.3",
     "@vitest/browser-playwright": "5.0.3",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.26.1",
-    "@willbooster/web-tree-sitter": "7.0.5",
+    "@willbooster/wb": "22.26.2",
+    "@willbooster/web-tree-sitter": "10.0.2",
     "conventional-changelog-conventionalcommits": "10.4.0",
-    "lefthook": "2.2.1",
-    "oxfmt": "0.72.0",
-    "oxlint": "1.87.0",
+    "lefthook": "2.2.2",
+    "oxfmt": "0.73.0",
+    "oxlint": "1.88.0",
     "oxlint-tsgolint": "7.0.2004",
     "playwright": "1.63.0",
     "semantic-release": "25.0.9",
@@ -60,7 +60,7 @@
     "wrangler": "4.147.0"
   },
   "peerDependencies": {
-    "@willbooster/web-tree-sitter": "^7.0.5"
+    "@willbooster/web-tree-sitter": "^10.0.2"
   },
   "peerDependenciesMeta": {
     "@willbooster/web-tree-sitter": {

package/tree-sitter.json

@@ -18,7 +18,7 @@
     }
   ],
   "metadata": {
-    "version": "2.0.0",
+    "version": "3.0.0",
     "license": "MIT",
     "description": "Dart grammar for tree-sitter",
     "authors": [