@willbooster/tree-sitter-haskell 13.1.2 → 14.0.0

package/README.md

@@ -13,7 +13,7 @@ Haskell grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), f
 to its authors and contributors. This is not an official release of that project.
 
 This fork is based on upstream's version 0.23.1 grammar 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. This package supports the fork's runtime version 10.0.2 or later within 10.x in the 10.x series; upstream's runtime rejects it.
+[WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parser carries that fork's own ABI number. This package supports the fork's runtime version 10.0.2 or later within 10.x; upstream's runtime rejects it.
 [Upstream's README at that version](https://github.com/tree-sitter/tree-sitter-haskell/blob/v0.23.1/README.md) lists
 the supported language extensions. The fork's node and query contracts are described below.
 
@@ -42,7 +42,7 @@ reports an error: the lexers of the WillBooster/tree-sitter generator let charac
 ## Usage
 
 The npm package ships `tree-sitter-haskell.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 10.0.2 or later within 10.x 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:
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 10.0.2 or later within 10.x, 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';
@@ -90,6 +90,8 @@ Declaration names and variable/operator callees remain indexed through nested pa
 
 Function and type declaration-head parentheses are anonymous syntax: the enclosing declaration directly exposes its `name`, parameter groups and infix `head` fields. Parentheses inside parameters and types retain their existing nodes. A grouped variable name, including a qualified name, uses one `parenthesized_name` node with a direct name child, independent of grouping depth. A symbolic variable operator keeps its required prefix parentheses in `prefix_id`: `(<+>)` and `(Demo.<+>)` remain `prefix_id`, while redundant grouping such as `((<+>))` adds one `parenthesized_name` wrapper around that node. This also applies to unapplied names; only function position creates a call reference or call highlight. A parenthesized simple binding name uses `parenthesized_name` in the `bind` node's `name` field, retaining one wrapper at any grouping depth. Complex expressions retain ordinary `parens` nodes. These changes affect public syntax trees.
 
+Local `where` clauses form a `where_clause` node spanning the keyword and its binding block. Enclosing bindings, functions and case alternatives expose it through their `binds` field; the clause's optional `binds` field contains `local_binds`. The latter's `decl` fields and source ranges are unchanged. This provides a single named node for selecting or identifying the scope of `where` without including the enclosing declaration. For `let`, `binds` directly contains `local_binds`. Queries can still capture sibling `"where"` and `local_binds` nodes to obtain their separate ranges.
+
 Operator uses retain unresolved source order. Expressions use `operator_chain` with repeated `operand` and `operator` fields: `6 * 7 == 42` has operands `6`, `7`, `42` and operators `*`, `==`. Application stays inside an operand; explicit parentheses and greedy block bodies retain their own grouping. A `prefix_operator` field records each named `prefix_negation` token at its source position, including unary-only chains. Its semantic extent depends on fixities and language extensions, so the tree does not assign it an operand subtree.
 
 Type, pattern and constraint operators use `infix_chain` with repeated `operand` and `operator` fields, even for a single operator. Function, type and data declaration heads retain the `infix` node because they define one operator. Instance and standalone deriving implementation tags identify a class only for a single-operator head; multi-operator heads require fixity resolution by the caller.

package/grammar/decl.js

@@ -64,7 +64,7 @@ module.exports = {
       field('match', alias($._simple_bind_match, $.match)),
       repeat1(field('match', alias($._bind_match, $.match))),
     ),
-    optional($._where_binds),
+    optional(field('binds', $.where_clause)),
   ),
 
   _function_name: $ => field('name', $._var),
@@ -124,7 +124,7 @@ module.exports = {
 
   local_binds: $ => layout($, field('decl', $._local_decl)),
 
-  _where_binds: $ => seq($._where, optional(field('binds', $.local_binds))),
+  where_clause: $ => seq($._where, optional(field('binds', $.local_binds))),
 
   _foreign_calling_keyword: _ => token(choice(
     'ccall',

package/grammar/exp.js

@@ -209,13 +209,13 @@ module.exports = {
   alternative: $ => seq(
     field('pattern', $._pat),
     $._matches,
-    optional($._where_binds),
+    optional(field('binds', $.where_clause)),
   ),
 
   _nalt: $ => seq(
     field('patterns', $.patterns),
     $._matches,
-    optional($._where_binds),
+    optional(field('binds', $.where_clause)),
   ),
 
   alternatives: $ => layout_sort($, $._cmd_layout_start_case, field('alternative', $.alternative)),

package/hsc/src/node-types.json

@@ -906,7 +906,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -1200,7 +1200,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -1602,7 +1602,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -3134,7 +3134,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -6934,6 +6934,22 @@
       }
     }
   },
+  {
+    "type": "where_clause",
+    "named": true,
+    "fields": {
+      "binds": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "local_binds",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "wildcard",
     "named": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-haskell",
-  "version": "13.1.2",
+  "version": "14.0.0",
   "description": "Haskell grammar for tree-sitter",
   "keywords": [
     "incremental",

package/src/node-types.json

@@ -886,7 +886,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -1180,7 +1180,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -1566,7 +1566,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -3052,7 +3052,7 @@
         "required": false,
         "types": [
           {
-            "type": "local_binds",
+            "type": "where_clause",
             "named": true
           }
         ]
@@ -6731,6 +6731,22 @@
       }
     }
   },
+  {
+    "type": "where_clause",
+    "named": true,
+    "fields": {
+      "binds": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "local_binds",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "wildcard",
     "named": true,

package/tree-sitter.json

@@ -35,7 +35,7 @@
     }
   ],
   "metadata": {
-    "version": "13.1.2",
+    "version": "14.0.0",
     "license": "MIT",
     "description": "Haskell grammar for tree-sitter",
     "authors": [