@willbooster/tree-sitter-html 1.0.5 → 2.0.0

package/README.md

@@ -14,15 +14,19 @@ 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.0.0 or later
+number, so it loads only with the WillBooster runtime, version 2.0.0 or later in the 2.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
 lexers that generator emits treat a NUL character as an ordinary character. This grammar also accepts literal `>`
 characters and bare `&` in text nodes, which upstream 0.23.2 rejects. A bare `&` becomes its own `text` node beside
-surrounding text, while character references remain `entity` nodes. Its scanner requires an HTML tag-name boundary after
+surrounding text, while character references remain `entity` nodes. Text nodes include leading, trailing, and whitespace-only content, including whitespace between markup and character references. Its scanner requires an HTML tag-name boundary after
 `</script` and `</style`, so longer names and overlapping prefixes remain raw text. Closing-name comparisons
-fold only ASCII letters, and embedded NUL characters remain part of raw-text content. Void elements close
+fold only ASCII letters, and embedded NUL characters remain part of raw-text content. Script content follows
+HTML escaped and double-escaped states, so closing-tag text inside a double escape remains raw text. A script that reaches
+EOF while scanning raw content closes implicitly without an error: its `script_element` has no `end_tag` child, and its
+remaining content stays available for JavaScript injection. Incomplete closing tags such as `</script` still report
+recovery errors. Unterminated style elements still report an error. Void elements close
 before following text, entities, and complete comments, which become siblings instead of children.
 Scanner serialization stores the open-tag stack from its innermost tag, compressing runs of identical tags, so active
 void, script, and style elements retain their identities when deeply nested. When deep nesting of distinct tags
@@ -33,7 +37,7 @@ Malformed input after a void element can replace its enclosing element with an `
 ## 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.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 2.0.0 or later in the 2.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';
@@ -80,7 +84,7 @@ fuzzed with:
 ```toml
 [dependencies]
 tree-sitter = { package = "willbooster-tree-sitter", version = "2.0.0" }
-tree-sitter-html = { package = "willbooster-tree-sitter-html", version = "1" }
+tree-sitter-html = { package = "willbooster-tree-sitter-html", version = "2" }
 ```
 
 ```rust

package/grammar.js

@@ -62,7 +62,7 @@ module.exports = grammar({
     script_element: $ => seq(
       alias($.script_start_tag, $.start_tag),
       optional($.raw_text),
-      $.end_tag,
+      choice($.end_tag, $._implicit_end_tag),
     ),
 
     style_element: $ => seq(
@@ -126,14 +126,13 @@ module.exports = grammar({
 
     attribute_value: _ => /[^<>"'=\s]+/,
 
-    // HTML fixes the named-reference set: https://html.spec.whatwg.org/multipage/named-characters.html
-    entity: _ => /&(#([xX][0-9a-fA-F]{1,6}|[0-9]{1,5})|[A-Za-z]{1,30});?/,
+    entity: _ => token(/&(#([xX][0-9a-fA-F]{1,6}|[0-9]{1,5})|[A-Za-z]{1,30});?/),
 
     quoted_attribute_value: $ => choice(
       seq('\'', optional(alias(/[^']+/, $.attribute_value)), '\''),
       seq('"', optional(alias(/[^"]+/, $.attribute_value)), '"'),
     ),
 
-    text: _ => /[^<&\s]([^<&]*[^<&\s])?|&/,
+    text: _ => token.immediate(/[^<&]+|&/),
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-html",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "description": "HTML grammar for tree-sitter",
   "keywords": [
     "incremental",

package/tree-sitter.json

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