@willbooster/tree-sitter-xml 1.0.2 → 2.0.0

package/README.md

@@ -14,19 +14,19 @@ to its authors and contributors. This is not an official release of that project
 
 This fork builds on the grammars and queries of upstream's version 0.7.0 and generates the parsers with the
 [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parsers carry that fork's own ABI
-number (`0x57420001`) and load only with that fork's runtime, version 2.0.0 or later: upstream's tree-sitter runtime
-rejects them. The XML scanner adapts to the generated array API with the change upstream itself made after 0.7.0. The
-parsers differ from upstream's 0.7.0 packages in these ways:
+number (`0x57420006`) and load with that fork's runtime, version 7.0.5 or later in the 7.x series. The XML scanner
+adapts to the generated array API with the change upstream itself made after 0.7.0. The parsers differ from
+upstream's 0.7.0 packages in these ways:
 
 - A NUL character inside a quoted literal, such as an attribute value (`AttValue`), an entity value (`EntityValue`),
   or a system literal (`SystemLiteral`), is part of that token, where upstream's lexer reports an error.
 - Where a NUL character cannot be part of any token, the `ERROR` node covers it as it covers any other unexpected
   character, without the unexpected-character node that upstream's parsers put inside it.
 
-- Nonempty attribute values (`AttValue` and `PseudoAttValue`) expose their full unquoted value through the `content`
-  field. This field points to an anonymous `content` node wrapping text and references. Access references through this
-  wrapper using the node API; references are not direct children of the attribute-value node. Empty values have no
-  `content` field.
+- Nonempty attribute values (`AttValue` and `PseudoAttValue`) and entity values (`EntityValue`) expose their full
+  unquoted value through the `content` field. This field points to an anonymous `content` node wrapping text and
+  references. Access references through this wrapper using the node API; references are not direct children of the
+  value node. Empty values have no `content` field.
 
 It holds two grammars, as upstream does: `xml` parses XML documents, including an internal DTD subset, and `dtd`
 parses external DTD files.
@@ -34,7 +34,8 @@ parses external DTD files.
 ## Usage
 
 The npm package ships `tree-sitter-xml.wasm` and `tree-sitter-dtd.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';
@@ -82,8 +83,8 @@ fuzzed with:
 
 ```toml
 [dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "2" }
-tree-sitter-xml = { package = "willbooster-tree-sitter-xml", version = "1" }
+tree-sitter = { package = "willbooster-tree-sitter", version = "7.0.5" }
+tree-sitter-xml = { package = "willbooster-tree-sitter-xml", version = "2" }
 ```
 
 ```rust

package/common/common.mjs

@@ -38,14 +38,14 @@ export const att_value = ($, q) =>
 export const entity_value = ($, q) =>
   seq(
     q,
-    field(
+    optional(field(
       'content',
-      repeat(choice(
+      alias(repeat1(choice(
         new RegExp(`[^<%&${q}]`),
         $.PEReference,
         $._Reference
-      ))
-    ),
+      )), 'content')
+    )),
     q
   );
 

package/dtd/src/node-types.json

@@ -199,16 +199,12 @@
     "named": true,
     "fields": {
       "content": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "PEReference",
-            "named": true
-          },
-          {
-            "type": "_Reference",
-            "named": true
+            "type": "content",
+            "named": false
           }
         ]
       }
@@ -524,6 +520,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "PEReference",
+          "named": true
+        },
         {
           "type": "_Reference",
           "named": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-xml",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "XML & DTD grammars for tree-sitter",
   "keywords": [
     "incremental",
@@ -53,7 +53,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.26.1",
-    "@willbooster/web-tree-sitter": "2.0.28",
+    "@willbooster/web-tree-sitter": "7.0.5",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.2.1",
     "oxfmt": "0.72.0",
@@ -66,7 +66,7 @@
     "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

@@ -36,7 +36,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.2",
+    "version": "2.0.0",
     "license": "MIT",
     "description": "XML & DTD grammars for tree-sitter",
     "authors": [

package/xml/src/node-types.json

@@ -276,16 +276,12 @@
     "named": true,
     "fields": {
       "content": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "PEReference",
-            "named": true
-          },
-          {
-            "type": "_Reference",
-            "named": true
+            "type": "content",
+            "named": false
           }
         ]
       }
@@ -667,6 +663,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "PEReference",
+          "named": true
+        },
         {
           "type": "_Reference",
           "named": true