@konomanoasa/tree-sitter-gitattributes 0.6.0 → 0.7.0

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "konomanoasa-tree-sitter-gitattributes"
-version = "0.6.0"
+version = "0.7.0"
 description = "Tree-sitter grammar for gitattributes."
 readme = "README.md"
 license = "MIT"

package/README.md

@@ -5,7 +5,7 @@
 [![npm](https://img.shields.io/npm/v/@konomanoasa/tree-sitter-gitattributes)](https://www.npmjs.com/package/@konomanoasa/tree-sitter-gitattributes)
 
 [Tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammar for
-Git attributes files 2.55.0.
+Git attributes files 2.56.0.
 
 ## Installation
 
@@ -23,8 +23,8 @@ npm test
 
 ## Specifications
 
-- [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)
+- [Git 2.56.0 gitattributes manual](https://git-scm.com/docs/gitattributes/2.56.0)
+- [Git 2.56.0 gitignore manual](https://git-scm.com/docs/gitignore/2.56.0)
 
 ## License
 

package/binding.gyp

@@ -0,0 +1,38 @@
+{
+  "targets": [
+    {
+      "target_name": "tree_sitter_gitattributes_binding",
+      "sources": [
+        "bindings/node/binding.cc",
+        "src/parser.c",
+        "src/scanner.c"
+      ],
+      "include_dirs": ["src"],
+      "dependencies": [
+        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except"
+      ],
+      "cflags_c": ["-std=c17"],
+      "cflags_cc": ["-std=c++17"],
+      "msvs_settings": {
+        "VCCLCompilerTool": {
+          "AdditionalOptions": ["/utf-8"],
+          "AdditionalOptions!": ["-std:c++20"],
+          "LanguageStandard": "stdcpp17",
+          "LanguageStandard_C": "stdc17"
+        }
+      },
+      "target_conditions": [
+        [
+          "OS==\"mac\"",
+          {
+            "xcode_settings": {
+              "CLANG_CXX_LANGUAGE_STANDARD": "c++17",
+              "GCC_C_LANGUAGE_STANDARD": "c17",
+              "MACOSX_DEPLOYMENT_TARGET": "14.0"
+            }
+          }
+        ]
+      ]
+    }
+  ]
+}

package/bindings/node/binding.cc

@@ -0,0 +1,25 @@
+#include <napi.h>
+
+struct TSLanguage;
+extern "C" const TSLanguage *tree_sitter_gitattributes();
+
+namespace {
+
+constexpr napi_type_tag language_type_tag = {
+  0x8AF2E5212AD58ABF,
+  0xD5006CAD83ABBA16
+};
+
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+  auto language = Napi::External<TSLanguage>::New(
+    env,
+    const_cast<TSLanguage *>(tree_sitter_gitattributes())
+  );
+  language.TypeTag(&language_type_tag);
+  exports["language"] = language;
+  return exports;
+}
+
+}
+
+NODE_API_MODULE(tree_sitter_gitattributes_binding, Init)

package/bindings/node/index.d.ts

@@ -0,0 +1,7 @@
+import type { Language } from "tree-sitter";
+
+declare const binding: Language & {
+  HIGHLIGHTS_QUERY: string;
+};
+
+export default binding;

package/bindings/node/index.js

@@ -0,0 +1,14 @@
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import load from "node-gyp-build";
+
+const binding = load(fileURLToPath(new URL("../..", import.meta.url)));
+binding.nodeTypeInfo = JSON.parse(
+  readFileSync(new URL("../../src/node-types.json", import.meta.url), "utf8"),
+);
+binding.HIGHLIGHTS_QUERY = readFileSync(
+  new URL("../../queries/highlights.scm", import.meta.url),
+  "utf8",
+);
+
+export default binding;

package/bindings/python/binding.c

@@ -1,6 +1,6 @@
 #include <Python.h>
 
-#include "tree_sitter/parser.h"
+#include "../../src/tree_sitter/parser.h"
 
 const TSLanguage *tree_sitter_gitattributes(void);
 

package/package.json

@@ -1,12 +1,22 @@
 {
   "name": "@konomanoasa/tree-sitter-gitattributes",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Tree-sitter grammar for gitattributes.",
   "license": "MIT",
   "repository": "git+https://github.com/konomanoasa/tree-sitter-gitattributes.git",
   "type": "module",
+  "exports": {
+    ".": {
+      "types": "./bindings/node/index.d.ts",
+      "default": "./bindings/node/index.js"
+    }
+  },
   "files": [
     "Cargo.toml",
+    "binding.gyp",
+    "bindings/node/*.cc",
+    "bindings/node/*.js",
+    "bindings/node/*.ts",
     "bindings/python/*.c",
     "bindings/python/*.py",
     "bindings/python/*.pyi",
@@ -26,23 +36,33 @@
     "access": "public"
   },
   "scripts": {
-    "build": "npm run tree-sitter -- build-all",
+    "build": "node-gyp rebuild && node-gyp configure -- -f compile_commands_json && npm run tree-sitter -- build-all",
     "check": "biome check . && tsc",
     "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/build.test.js test/cst.test.js test/highlight.test.js test/incremental.test.js test/parser.test.js && node scripts/check-c.js --test",
+    "install": "node-gyp-build",
+    "test": "npm run tree-sitter -- test-corpus --rebuild && node --test --test-concurrency=1 test/bindings.test.js test/build.test.js test/cst.test.js test/highlight.test.js test/incremental.test.js test/parser.test.js && node scripts/check-c.js --test",
     "test:fuzz": "npm run tree-sitter -- fuzz-all --iterations 100 --edits 5",
     "test:sanitize": "node scripts/check-c.js --sanitize",
     "tree-sitter": "node scripts/tree-sitter.js"
   },
+  "dependencies": {
+    "node-addon-api": "8.9.2",
+    "node-gyp-build": "4.8.4"
+  },
+  "peerDependencies": {
+    "tree-sitter": "0.25.1"
+  },
   "devDependencies": {
-    "@biomejs/biome": "2.6.2",
-    "@types/node": "26.6.5",
+    "@biomejs/biome": "2.6.4",
+    "@types/node": "26.6.6",
+    "node-gyp": "13.1.0",
     "tree-sitter-cli": "0.27.1",
     "typescript": "7.0.2"
   },
   "allowScripts": {
+    "tree-sitter": true,
     "tree-sitter-cli": true
   }
 }

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "konomanoasa-tree-sitter-gitattributes"
-version = "0.6.0"
+version = "0.7.0"
 description = "Tree-sitter grammar for gitattributes."
 readme = "README.md"
 license = "MIT"

package/src/parser.c

@@ -6137,7 +6137,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_gitattributes(void) {
     .max_reserved_word_set_size = 0,
     .metadata = {
       .major_version = 0,
-      .minor_version = 6,
+      .minor_version = 7,
       .patch_version = 0,
     },
   };

package/src/scanner.c

@@ -135,7 +135,6 @@ absent(TSLexer *lexer, enum Token missing, enum Token incomplete) {
   return lexer->eof(lexer) ? incomplete : missing;
 }
 
-// Include the next decoded character so edits invalidate the run.
 static bool invalid_run(Scanner *s, TSLexer *lexer, const bool *valid) {
   do advance(s, lexer);
   while (!lexer->eof(lexer) && lexer->lookahead == DECODE_ERROR);
@@ -440,7 +439,6 @@ static void hold_prefix(Scanner *s, Cursor *r, uint32_t prefix_end) {
   s->next_end = r->end;
 }
 
-// Consume lookahead units fully so edits inside them invalidate the decision.
 static bool prepare_glob(Scanner *s, TSLexer *lexer, const bool *valid) {
   Cursor r = cursor(s, lexer, s->content_end);
   bool separator = r.c == '/';
@@ -470,11 +468,11 @@ static bool prepare_glob(Scanner *s, TSLexer *lexer, const bool *valid) {
       s->next_end = r.end;
       step(&r);
     }
-    const bool pair = count == 2 && s->component_start;
+    const bool multiple = count >= 2 && s->component_start;
     const bool tail = r.c == CURSOR_END && s->after_separator;
     if (r.c == '\\') step(&r);
     const bool slash = r.c == '/';
-    s->next = pair && (slash || tail) ? RECURSIVE_WILDCARD : WILDCARD;
+    s->next = multiple && (slash || tail) ? RECURSIVE_WILDCARD : WILDCARD;
   } else if (r.kind == QUOTED_ESCAPE && r.c != '[') s->next = QUOTED_ESCAPE;
   else if (r.c == '[') {
     s->next = SET_OPEN;

package/tree-sitter.json

@@ -12,7 +12,7 @@
     }
   ],
   "metadata": {
-    "version": "0.6.0",
+    "version": "0.7.0",
     "license": "MIT",
     "description": "Tree-sitter grammar for gitattributes.",
     "links": {
@@ -22,7 +22,7 @@
   "bindings": {
     "c": false,
     "go": false,
-    "node": false,
+    "node": true,
     "python": true,
     "rust": true,
     "swift": false