@willbooster/tree-sitter-xml 1.0.1 → 1.0.3

package/README.md

@@ -16,13 +16,18 @@ This fork builds on the grammars and queries of upstream's version 0.7.0 and gen
 [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 parse as the parsers in upstream's 0.7.0 packages do, except for NUL characters, which are ordinary characters:
+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`) 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.
 

package/common/common.mjs

@@ -21,13 +21,13 @@ export const pubid_char = (q) =>
 export const att_value = ($, q) =>
   seq(
     q,
-    field(
+    optional(field(
       'content',
-      repeat(choice(
+      alias(repeat1(choice(
         new RegExp(`[^<&${q}]`),
         $._Reference
-      ))
-    ),
+      )), 'content')
+    )),
     q
   );
 
@@ -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

@@ -121,12 +121,12 @@
     "named": true,
     "fields": {
       "content": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "_Reference",
-            "named": true
+            "type": "content",
+            "named": false
           }
         ]
       }
@@ -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
           }
         ]
       }
@@ -516,6 +512,25 @@
       ]
     }
   },
+  {
+    "type": "content",
+    "named": false,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "PEReference",
+          "named": true
+        },
+        {
+          "type": "_Reference",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "contentspec",
     "named": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-xml",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "XML & DTD grammars for tree-sitter",
   "keywords": [
     "incremental",

package/tree-sitter.json

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

package/xml/src/node-types.json

@@ -121,12 +121,12 @@
     "named": true,
     "fields": {
       "content": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "_Reference",
-            "named": true
+            "type": "content",
+            "named": false
           }
         ]
       }
@@ -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
           }
         ]
       }
@@ -517,12 +513,12 @@
     "named": true,
     "fields": {
       "content": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "_Reference",
-            "named": true
+            "type": "content",
+            "named": false
           }
         ]
       }
@@ -659,6 +655,25 @@
       ]
     }
   },
+  {
+    "type": "content",
+    "named": false,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "PEReference",
+          "named": true
+        },
+        {
+          "type": "_Reference",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "content",
     "named": true,