@willbooster/tree-sitter-dart 1.0.0 → 2.0.0

package/README.md

@@ -5,33 +5,34 @@
 [![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.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-dart.svg)](https://crates.io/crates/willbooster-tree-sitter-dart)
 
 Dart grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
 [nielsenko/tree-sitter-dart](https://github.com/nielsenko/tree-sitter-dart). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork keeps the grammar and the external scanner of upstream's version 0.2.0 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 fork's runtime,
-version 2.0.0 or later; upstream's runtime rejects it, and the fork's runtime rejects parsers generated by upstream's CLI.
+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.
 
 ## Differences from upstream's parser
 
-Valid Dart parses to the same trees as with upstream's 0.2.0 parser. Two differences are known:
+Known differences from upstream's 0.2.0 parser include:
 
-- Error recovery on invalid input can differ, because the WillBooster/tree-sitter generator extracts keywords per
-  lexer state. Of 13,595 real-world files (flutter/flutter, dart-lang/core, rrousselGit/riverpod, and part of the Dart
-  SDK), 3 files that are invalid on purpose recover into a different tree, as do 2 of 10,197 truncated files; the error
-  flag is the same in every case. Their minimal inputs are `void main() {\n  print(\n        "foo" !==\n      null);`,
-  `test_nullAssert_insideCast(x) {\n  switch (x) {\n    case _! as num?:`, and
-  `    final v3 = (buffer.(p) {\n      return p == buffer;`.
+- Arrow function bodies include trailing selectors. For `(x) => a.b(x)`, the call belongs inside the
+  `function_expression_body`; upstream attaches it to the arrow function instead. Nested arrow functions follow the
+  same rule. Block-bodied function literals still support immediate calls and member access. Public node names and
+  the `parameters:` and `body:` fields are preserved.
+- Error recovery on invalid input can differ from upstream.
+  [Issue #4](https://github.com/WillBooster/tree-sitter-dart/issues/4) tracks these differences.
 - A NUL character in a line comment or between tokens parses as ordinary text, where upstream's lexer reports an error.
 
 ## Usage
 
 The npm package ships `tree-sitter-dart.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 in the 7.x series, 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';
@@ -77,8 +78,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
-tree-sitter-dart = { package = "willbooster-tree-sitter-dart", version = "1" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter-dart = { package = "willbooster-tree-sitter-dart", version = "2" }
 ```
 
 ```rust

package/grammar.js

@@ -145,9 +145,6 @@ module.exports = grammar({
     [$._primary, $.assignable_expression],
     [$._primary, $.labeled_statement],
     // Assignable-vs-wrapper: same chain reduces under either name; lookahead picks
-    [$.assignable_expression, $.member_expression, $._unary_expression],
-    [$.assignable_expression, $.index_expression, $._unary_expression],
-    [$.assignable_expression, $.null_aware_member_expression, $._unary_expression],
     [$.assignable_expression, $.null_aware_index_expression, $._unary_expression],
     // Type name ambiguities
     [$._type_name],
@@ -200,7 +197,6 @@ module.exports = grammar({
     [$.type_arguments, $.relational_operator, $.type_parameters],
     // Generic call/instantiation vs comparisons (TS-style GLR fork on `<`)
     [$._unary_expression, $.instantiation_expression],
-    [$._unary_expression, $.call_expression],
     // Record literal vs record field / record type
     [$._record_literal_no_const, $.record_field],
     [$.record_type, $._record_literal_no_const],
@@ -1149,7 +1145,7 @@ module.exports = grammar({
     _unary_expression: ($) =>
       prec(
         PREC.UNARY_PREFIX,
-        choice($._postfix_expression, $.unary_expression),
+        choice($._postfix_expression, $.unary_expression, $.function_expression),
       ),
 
     unary_expression: ($) =>
@@ -1274,7 +1270,7 @@ module.exports = grammar({
       choice(
         $._literal,
         $.identifier,
-        $.function_expression,
+        alias($._function_primary, $.function_expression),
         $._instantiation,
         $.parenthesized_expression,
         "this",
@@ -1293,11 +1289,17 @@ module.exports = grammar({
       ),
 
     function_expression_body: ($) =>
-      choice(
-        seq(optional("async"), "=>", $._expression),
-        seq(optional(choice("async", "async*", "sync*")), $.block),
+      seq(optional("async"), "=>", $._expression),
+
+    _function_primary: ($) =>
+      seq(
+        field("parameters", $._formal_parameter_part),
+        field("body", alias($._function_primary_body, $.function_expression_body)),
       ),
 
+    _function_primary_body: ($) =>
+      seq(optional(choice("async", "async*", "sync*")), $.block),
+
     // Hidden supertype: any expression that constructs an instance. Lets
     // queries address the three forms (new/const/implicit) uniformly via
     // (_instantiation) without alternation. Does not add an AST layer.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-dart",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Dart grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -46,22 +46,21 @@
     "@vitest/browser-playwright": "5.0.3",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.24.0",
-    "@willbooster/web-tree-sitter": "2.0.1",
+    "@willbooster/wb": "22.26.1",
+    "@willbooster/web-tree-sitter": "7.0.5",
     "conventional-changelog-conventionalcommits": "10.4.0",
-    "lefthook": "2.1.16",
-    "oxfmt": "0.71.0",
-    "oxlint": "1.86.0",
-    "oxlint-tsgolint": "7.0.2003",
+    "lefthook": "2.2.1",
+    "oxfmt": "0.72.0",
+    "oxlint": "1.87.0",
+    "oxlint-tsgolint": "7.0.2004",
     "playwright": "1.63.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "typescript": "7.0.2",
     "vitest": "5.0.3",
     "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/tree-sitter.json

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