@konomanoasa/tree-sitter-gitattributes 0.2.0 → 0.4.0

package/Cargo.toml

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

package/README.md

@@ -15,7 +15,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
@@ -28,6 +28,10 @@ npm test
 - [Git 2.55.0 gitattributes manual](https://git-scm.com/docs/gitattributes/2.55.0)
 - [Git 2.55.0 gitignore manual](https://git-scm.com/docs/gitignore/2.55.0)
 
+## Used By
+
+[gitfile-ts-mode](https://github.com/konomanoasa/gitfile-ts-mode): Emacs major mode.
+
 ## License
 
 [MIT](LICENSE)

package/grammar.js

@@ -1,46 +1,71 @@
+const missingKinds = (name) => [
+  [`missing_${name}`, "invalid_syntax", `missing_${name}`],
+  [`incomplete_${name}`, "incomplete_syntax", `missing_${name}`],
+];
 const issueKinds = [
-  ["missing_set_close", "invalid_syntax", "missing_set_close"],
-  ["incomplete_set_close", "incomplete_syntax", "missing_set_close"],
+  ...missingKinds("set_close"),
   ["invalid_encoding", "invalid_syntax", "invalid_encoding"],
   ["negative_pattern", "invalid_syntax", "negative_pattern"],
-  ["invalid_escape", "invalid_syntax", "incomplete_escape"],
+  ["ended_escape", "invalid_syntax", "incomplete_escape"],
   ["incomplete_escape", "incomplete_syntax", "incomplete_escape"],
   ["invalid_quoted_escape", "invalid_syntax", "invalid_quoted_escape"],
   ["ended_quoted_escape", "invalid_syntax", "incomplete_quoted_escape"],
   ["incomplete_quoted_escape", "incomplete_syntax", "incomplete_quoted_escape"],
-  ["missing_quote", "invalid_syntax", "missing_quote_close"],
-  ["incomplete_quote", "incomplete_syntax", "missing_quote_close"],
-  ["missing_separator", "invalid_syntax", "missing_attribute_separator"],
-  ["missing_name", "invalid_syntax", "missing_attribute_name"],
-  ["incomplete_name", "incomplete_syntax", "missing_attribute_name"],
+  ...missingKinds("quote_close"),
+  [
+    "missing_attribute_separator",
+    "invalid_syntax",
+    "missing_attribute_separator",
+  ],
+  ...missingKinds("attribute_name"),
   ["invalid_name_character", "invalid_syntax", "invalid_name_character"],
+  ["incomplete_name_character", "incomplete_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 missing = ($, name) =>
+  choice(issue($, `missing_${name}`), issue($, `incomplete_${name}`));
 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 = ($) =>
-  optional(
-    choice(
-      field("closing", $.quote_close),
-      ...issues($, "missing_quote", "incomplete_quote"),
-    ),
-  );
+  optional(choice(field("closing", $.quote_close), missing($, "quote_close")));
+const attributeName = ($) =>
+  choice(field("name", $.attribute_name), missing($, "attribute_name"));
+const globIssues = ($) => [
+  ...issues(
+    $,
+    "invalid_encoding",
+    "ended_escape",
+    "incomplete_escape",
+    ...quotedEscapeIssues,
+  ),
+  heldPrefix($, "invalid_encoding", ...quotedEscapeIssues),
+];
 
 export default grammar({
   name: "gitattributes",
@@ -51,7 +76,6 @@ export default grammar({
     $._rule_start,
     $._macro_start,
     $._eof,
-    $.line_ending,
     $._layout,
     $._separator,
     $._attribute_start,
@@ -105,6 +129,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: ($) =>
@@ -126,14 +151,17 @@ export default grammar({
         $._macro_start,
         optional(field("opening", $.quote_open)),
         field("marker", $.macro_marker),
-        choice(field("name", $.attribute_name), missingName($)),
+        attributeName($),
         quoteClose($),
         optional($._attributes),
         $._end,
       ),
     _attributes: ($) =>
       repeat1(
-        seq(choice($._separator, issue($, "missing_separator")), $.attribute),
+        seq(
+          choice($._separator, issue($, "missing_attribute_separator")),
+          $.attribute,
+        ),
       ),
     attribute: ($) =>
       seq(
@@ -141,7 +169,7 @@ export default grammar({
         optional(
           field("modifier", choice($.unset_marker, $.unspecified_marker)),
         ),
-        choice(field("name", $.attribute_name), missingName($)),
+        attributeName($),
         optional(
           seq(
             field("operator", $.assignment_operator),
@@ -161,6 +189,8 @@ export default grammar({
               $,
               "invalid_encoding",
               "invalid_name_character",
+              "incomplete_name_character",
+              "invalid_name_escape",
               ...quotedEscapeIssues,
             ),
             heldPrefix($, "invalid_encoding"),
@@ -190,15 +220,8 @@ export default grammar({
                 $.escape,
                 $.quoted_escape,
                 $.character_set,
-                ...issues(
-                  $,
-                  "invalid_encoding",
-                  "negative_pattern",
-                  "invalid_escape",
-                  "incomplete_escape",
-                  ...quotedEscapeIssues,
-                ),
-                heldPrefix($, "invalid_encoding", ...quotedEscapeIssues),
+                issue($, "negative_pattern"),
+                ...globIssues($),
               ),
             ),
           ),
@@ -220,21 +243,11 @@ export default grammar({
               $.quoted_escape,
               $.character_range,
               $.character_class,
-              ...issues(
-                $,
-                "invalid_encoding",
-                "invalid_escape",
-                "incomplete_escape",
-                ...quotedEscapeIssues,
-              ),
-              heldPrefix($, "invalid_encoding", ...quotedEscapeIssues),
+              ...globIssues($),
             ),
           ),
         ),
-        choice(
-          field("closing", $.set_close),
-          ...issues($, "missing_set_close", "incomplete_set_close"),
-        ),
+        choice(field("closing", $.set_close), missing($, "set_close")),
       ),
     character_range: ($) =>
       seq(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomanoasa/tree-sitter-gitattributes",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "type": "module",
   "description": "Tree-sitter grammar for gitattributes.",
   "license": "MIT",
@@ -21,15 +21,15 @@
   },
   "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",
-    "test:incremental": "node --test test/incremental.test.js",
+    "test:incremental": "node --test --test-concurrency=1 test/cst.test.js test/parser.test.js test/incremental.test.js",
     "test:sanitize": "node scripts/check-c.js --sanitize",
     "test:scanner": "node scripts/check-c.js",
     "tree-sitter": "node scripts/tree-sitter.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