@konomanoasa/tree-sitter-gitattributes 0.2.0 → 0.3.0

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "konomanoasa-tree-sitter-gitattributes"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2024"
 description = "Tree-sitter grammar for gitattributes."
 readme = "README.md"

package/README.md

@@ -7,6 +7,11 @@
 [Tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammar for
 Git attributes files 2.55.0.
 
+## Syntax Issues
+
+The parser detects syntax issues, including missing syntax, while preserving the surrounding structure.
+These issues are represented as `syntax_issue` nodes.
+
 ## Installation
 
 ```sh
@@ -15,7 +20,7 @@ npm install @konomanoasa/tree-sitter-gitattributes
 
 ## Development
 
-Development uses Node.js 24 or later.
+Development uses Node.js 24.21.0 or later.
 
 ```sh
 npm install

package/grammar.js

@@ -14,24 +14,36 @@ const issueKinds = [
   ["missing_name", "invalid_syntax", "missing_attribute_name"],
   ["incomplete_name", "incomplete_syntax", "missing_attribute_name"],
   ["invalid_name_character", "invalid_syntax", "invalid_name_character"],
+  [
+    "invalid_name_escape",
+    "invalid_syntax",
+    "invalid_name_character",
+    "quoted_escape",
+  ],
+];
+const quotedEscapeIssues = [
+  "invalid_quoted_escape",
+  "ended_quoted_escape",
+  "incomplete_quoted_escape",
 ];
+
 const issueRules = Object.fromEntries(
-  issueKinds.flatMap(([token, outcome, reason]) => [
-    [`_${token}_outcome`, ($) => alias($[`_${token}`], $[reason])],
+  issueKinds.flatMap(([token, outcome, reason, child]) => [
+    ...(child
+      ? [[`_${token}_reason`, ($) => alias($[`_${token}`], $[child])]]
+      : []),
+    [
+      `_${token}_outcome`,
+      ($) => alias($[child ? `_${token}_reason` : `_${token}`], $[reason]),
+    ],
     [`_${token}_issue`, ($) => alias($[`_${token}_outcome`], $[outcome])],
   ]),
 );
 const issue = ($, name) =>
   field("issue", alias($[`_${name}_issue`], $.syntax_issue));
 const issues = ($, ...names) => names.map((name) => issue($, name));
-// A backslash held by the owner before the issue of the unit it cannot escape.
 const heldPrefix = ($, ...names) =>
   seq($._escape_prefix, choice(...issues($, ...names)));
-const quotedEscapeIssues = [
-  "invalid_quoted_escape",
-  "ended_quoted_escape",
-  "incomplete_quoted_escape",
-];
 const missingName = ($) =>
   choice(...issues($, "missing_name", "incomplete_name"));
 const quoteClose = ($) =>
@@ -51,7 +63,6 @@ export default grammar({
     $._rule_start,
     $._macro_start,
     $._eof,
-    $.line_ending,
     $._layout,
     $._separator,
     $._attribute_start,
@@ -105,6 +116,7 @@ export default grammar({
           choice($.blank_line, $.comment, $.attribute_rule, $.macro_definition),
         ),
       ),
+    line_ending: () => /\r?\n/,
     _end: ($) => seq(optional($._layout), choice($.line_ending, $._eof)),
     blank_line: ($) => seq($._blank_start, $._end),
     comment: ($) =>
@@ -161,6 +173,7 @@ export default grammar({
               $,
               "invalid_encoding",
               "invalid_name_character",
+              "invalid_name_escape",
               ...quotedEscapeIssues,
             ),
             heldPrefix($, "invalid_encoding"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomanoasa/tree-sitter-gitattributes",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "Tree-sitter grammar for gitattributes.",
   "license": "MIT",
@@ -21,11 +21,11 @@
   },
   "scripts": {
     "build": "npm run tree-sitter -- build-all",
-    "check": "biome check . && node scripts/check-c.js && node scripts/check-generated.js && npm test",
-    "format": "biome check --write . && node scripts/check-c.js --write",
+    "check": "biome check . && tsc --noEmit",
+    "check:queries": "npm run tree-sitter -- check-queries",
+    "format": "biome format --write .",
     "generate": "npm run tree-sitter -- generate-all",
     "test": "npm run tree-sitter -- test-corpus --rebuild && node --test --test-concurrency=1 \"test/*.test.js\"",
-    "test:bindings": "cargo test --locked",
     "test:fuzz": "node --test --test-name-pattern=\"fixed-seed generated histories\" test/incremental.test.js",
     "test:fuzz:corpus": "npm run tree-sitter -- fuzz-all --iterations 100 --edits 5",
     "test:highlights": "node --test test/highlight.test.js",
@@ -37,7 +37,8 @@
   "devDependencies": {
     "@biomejs/biome": "2.5.14",
     "@types/node": "26.5.1",
-    "tree-sitter-cli": "0.27.0"
+    "tree-sitter-cli": "0.27.0",
+    "typescript": "7.0.2"
   },
   "allowScripts": {
     "tree-sitter-cli": true

package/src/grammar.json

@@ -35,6 +35,10 @@
         ]
       }
     },
+    "line_ending": {
+      "type": "PATTERN",
+      "value": "\\r?\\n"
+    },
     "_end": {
       "type": "SEQ",
       "members": [
@@ -492,6 +496,19 @@
                   "value": "syntax_issue"
                 }
               },
+              {
+                "type": "FIELD",
+                "name": "issue",
+                "content": {
+                  "type": "ALIAS",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_invalid_name_escape_issue"
+                  },
+                  "named": true,
+                  "value": "syntax_issue"
+                }
+              },
               {
                 "type": "FIELD",
                 "name": "issue",
@@ -1588,6 +1605,33 @@
       },
       "named": true,
       "value": "invalid_syntax"
+    },
+    "_invalid_name_escape_reason": {
+      "type": "ALIAS",
+      "content": {
+        "type": "SYMBOL",
+        "name": "_invalid_name_escape"
+      },
+      "named": true,
+      "value": "quoted_escape"
+    },
+    "_invalid_name_escape_outcome": {
+      "type": "ALIAS",
+      "content": {
+        "type": "SYMBOL",
+        "name": "_invalid_name_escape_reason"
+      },
+      "named": true,
+      "value": "invalid_name_character"
+    },
+    "_invalid_name_escape_issue": {
+      "type": "ALIAS",
+      "content": {
+        "type": "SYMBOL",
+        "name": "_invalid_name_escape_outcome"
+      },
+      "named": true,
+      "value": "invalid_syntax"
     }
   },
   "extras": [],
@@ -1618,10 +1662,6 @@
       "type": "SYMBOL",
       "name": "_eof"
     },
-    {
-      "type": "SYMBOL",
-      "name": "line_ending"
-    },
     {
       "type": "SYMBOL",
       "name": "_layout"
@@ -1846,6 +1886,10 @@
       "type": "SYMBOL",
       "name": "_invalid_name_character"
     },
+    {
+      "type": "SYMBOL",
+      "name": "_invalid_name_escape"
+    },
     {
       "type": "SYMBOL",
       "name": "_error_sentinel"

package/src/node-types.json

@@ -422,6 +422,21 @@
       ]
     }
   },
+  {
+    "type": "invalid_name_character",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "quoted_escape",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "invalid_syntax",
     "named": true,
@@ -680,10 +695,6 @@
     "type": "invalid_encoding",
     "named": true
   },
-  {
-    "type": "invalid_name_character",
-    "named": true
-  },
   {
     "type": "invalid_quoted_escape",
     "named": true