@willbooster/tree-sitter-xml 1.0.2 → 1.0.3

package/README.md

@@ -23,10 +23,10 @@ parsers differ from upstream's 0.7.0 packages in these ways:
 - 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.

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": "1.0.3",
   "description": "XML & DTD grammars for tree-sitter",
   "keywords": [
     "incremental",

package/tree-sitter.json

@@ -36,7 +36,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.2",
+    "version": "1.0.3",
     "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