@willbooster/tree-sitter-html 4.0.0 → 5.0.0

package/README.md

@@ -14,7 +14,7 @@ to its authors and contributors. This is not an official release of that project
 
 This fork is based on upstream's version 0.23.2 grammar and 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, so it loads only with the WillBooster runtime, version 2.x
+number `0x57420006`, so it loads with the WillBooster runtime, version 7.0.5 or later in the 7.x series
 ([willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter),
 [@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter)); upstream's runtime rejects
 it. Input that contains NUL characters can parse to a different tree than with upstream's 0.23.2 parser, because the
@@ -51,7 +51,8 @@ between attributes. Comment-shaped text inside a quoted value remains part of th
 ## Usage
 
 The npm package ships `tree-sitter-html.wasm` for
-[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter) version 2.x, 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';
@@ -97,8 +98,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
-tree-sitter-html = { package = "willbooster-tree-sitter-html", version = "4" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter-html = { package = "willbooster-tree-sitter-html", version = "5" }
 ```
 
 ```rust

package/grammar.js

@@ -56,6 +56,7 @@ module.exports = grammar({
       $.comment,
       $.entity,
       $.text,
+      alias('&', $.text),
       $.element,
       $.script_element,
       $.style_element,
@@ -80,7 +81,7 @@ module.exports = grammar({
     style_element: $ => seq(
       alias($.style_start_tag, $.start_tag),
       optional($.raw_text),
-      $.end_tag,
+      choice($.end_tag, $._implicit_end_tag),
     ),
 
     start_tag: $ => seq(
@@ -164,6 +165,6 @@ module.exports = grammar({
       )), $.attribute_value)), '"'),
     ),
 
-    text: _ => token.immediate(/[^<&]+|&/),
+    text: _ => token(prec(1, /[^<&]+/)),
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-html",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "HTML 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.26.1",
-    "@willbooster/web-tree-sitter": "2.0.27",
+    "@willbooster/web-tree-sitter": "7.0.5",
     "conventional-changelog-conventionalcommits": "10.4.1",
     "lefthook": "2.2.1",
     "oxfmt": "0.72.0",
@@ -60,7 +60,7 @@
     "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

@@ -20,7 +20,7 @@
     }
   ],
   "metadata": {
-    "version": "4.0.0",
+    "version": "5.0.0",
     "license": "MIT",
     "description": "HTML grammar for tree-sitter",
     "authors": [