@konomanoasa/tree-sitter-gitattributes 0.4.2 → 0.6.0

package/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "konomanoasa-tree-sitter-gitattributes"
-version = "0.4.2"
-edition = "2024"
+version = "0.6.0"
 description = "Tree-sitter grammar for gitattributes."
 readme = "README.md"
-repository = "https://github.com/konomanoasa/tree-sitter-gitattributes"
 license = "MIT"
+repository = "https://github.com/konomanoasa/tree-sitter-gitattributes"
+edition = "2024"
 build = "bindings/rust/build.rs"
 links = "tree-sitter-gitattributes"
 include = [

package/README.md

@@ -26,10 +26,6 @@ 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)
-
 ## License
 
 [MIT](LICENSE)

package/bindings/python/__init__.py

@@ -0,0 +1,9 @@
+from importlib.resources import files
+
+from .binding import language
+
+HIGHLIGHTS_QUERY: str = (
+    files(__package__).joinpath("queries/highlights.scm").read_text("utf-8")
+)
+
+__all__ = ["HIGHLIGHTS_QUERY", "language"]

package/bindings/python/binding.c

@@ -0,0 +1,34 @@
+#include <Python.h>
+
+#include "tree_sitter/parser.h"
+
+const TSLanguage *tree_sitter_gitattributes(void);
+
+static PyObject *language(PyObject *self, PyObject *args) {
+  (void)self;
+  (void)args;
+  return PyCapsule_New(
+    (void *)tree_sitter_gitattributes(),
+    "tree_sitter.Language",
+    NULL
+  );
+}
+
+static PyMethodDef methods[] = {
+  {"language",
+    language,
+    METH_NOARGS,
+    "Return the gitattributes language capsule."},
+  {NULL, NULL, 0, NULL},
+};
+
+static struct PyModuleDef module = {
+  PyModuleDef_HEAD_INIT,
+  .m_name = "binding",
+  .m_size = -1,
+  .m_methods = methods,
+};
+
+PyMODINIT_FUNC PyInit_binding(void) {
+  return PyModule_Create(&module);
+}

package/bindings/python/binding.pyi

@@ -0,0 +1,3 @@
+from types import CapsuleType
+
+def language() -> CapsuleType: ...

package/grammar.js

@@ -76,6 +76,7 @@ export default grammar({
     $._rule_start,
     $._macro_start,
     $._eof,
+    $.line_ending,
     $._layout,
     $._separator,
     $._attribute_start,
@@ -120,7 +121,7 @@ export default grammar({
     ...issueKinds.map(([name]) => $[`_${name}`]),
     $._error_sentinel,
   ],
-  extras: () => [],
+  extras: ($) => [$._unmatchable],
   rules: {
     document: ($) =>
       repeat(
@@ -129,7 +130,7 @@ export default grammar({
           choice($.blank_line, $.comment, $.attribute_rule, $.macro_definition),
         ),
       ),
-    line_ending: () => /\r?\n/,
+    _unmatchable: () => token(seq(/[\s\S]/, /[^\s\S]/)),
     _end: ($) => seq(optional($._layout), choice($.line_ending, $._eof)),
     blank_line: ($) => seq($._blank_start, $._end),
     comment: ($) =>

package/package.json

@@ -1,15 +1,21 @@
 {
   "name": "@konomanoasa/tree-sitter-gitattributes",
-  "version": "0.4.2",
-  "type": "module",
+  "version": "0.6.0",
   "description": "Tree-sitter grammar for gitattributes.",
   "license": "MIT",
   "repository": "git+https://github.com/konomanoasa/tree-sitter-gitattributes.git",
+  "type": "module",
   "files": [
     "Cargo.toml",
+    "bindings/python/*.c",
+    "bindings/python/*.py",
+    "bindings/python/*.pyi",
+    "bindings/python/py.typed",
     "bindings/rust/*.rs",
     "grammar.js",
+    "pyproject.toml",
     "queries/*.scm",
+    "setup.py",
     "src/*.c",
     "src/*.json",
     "src/tree_sitter/*.h",
@@ -25,13 +31,9 @@
     "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: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-concurrency=1 test/cst.test.js test/parser.test.js test/incremental.test.js",
+    "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",
+    "test:fuzz": "npm run tree-sitter -- fuzz-all --iterations 100 --edits 5",
     "test:sanitize": "node scripts/check-c.js --sanitize",
-    "test:scanner": "node scripts/check-c.js",
     "tree-sitter": "node scripts/tree-sitter.js"
   },
   "devDependencies": {

package/pyproject.toml

@@ -0,0 +1,60 @@
+[project]
+name = "konomanoasa-tree-sitter-gitattributes"
+version = "0.6.0"
+description = "Tree-sitter grammar for gitattributes."
+readme = "README.md"
+license = "MIT"
+license-files = ["LICENSE"]
+
+[project.urls]
+Repository = "https://github.com/konomanoasa/tree-sitter-gitattributes"
+
+[dependency-groups]
+dev = [
+    "poethepoet==0.49.0",
+    "ruff==0.17.3",
+    "setuptools==84.2.1",
+    "tree-sitter==0.26.0",
+    "twine==7.0.0",
+    "ty==0.0.95",
+]
+
+[build-system]
+requires = ["setuptools==84.2.1"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+include-package-data = false
+packages = ["tree_sitter_gitattributes", "tree_sitter_gitattributes.queries"]
+
+[tool.setuptools.package-dir]
+tree_sitter_gitattributes = "bindings/python"
+"tree_sitter_gitattributes.queries" = "queries"
+
+[tool.setuptools.package-data]
+tree_sitter_gitattributes = ["*.pyi", "py.typed"]
+"tree_sitter_gitattributes.queries" = ["*.scm"]
+
+[tool.poe]
+executor.type = "simple"
+
+[tool.poe.tasks]
+build = "uv build --no-sources"
+check = [
+    { cmd = "ruff check setup.py bindings/python test/bindings.test.py" },
+    { cmd = "ty check setup.py bindings/python test/bindings.test.py" },
+    { cmd = "ruff format --check setup.py bindings/python test/bindings.test.py" },
+]
+format = "ruff format setup.py bindings/python test/bindings.test.py"
+test = "python test/bindings.test.py"
+
+[tool.ruff]
+indent-width = 4
+line-length = 80
+
+[tool.ruff.format]
+indent-style = "space"
+skip-magic-trailing-comma = true
+
+[tool.ruff.lint.isort]
+split-on-trailing-comma = false

package/setup.py

@@ -0,0 +1,28 @@
+import sys
+from pathlib import Path
+
+from setuptools import Extension, setup
+
+Path("dist/metadata").mkdir(parents=True, exist_ok=True)
+
+setup(
+    options={
+        "build": {"build_base": "dist/build"},
+        "egg_info": {"egg_base": "dist/metadata"},
+    },
+    ext_modules=[
+        Extension(
+            "tree_sitter_gitattributes.binding",
+            sources=[
+                "bindings/python/binding.c",
+                "src/parser.c",
+                "src/scanner.c",
+            ],
+            include_dirs=["src"],
+            depends=["src/tree_sitter/alloc.h", "src/tree_sitter/parser.h"],
+            extra_compile_args=["/std:c17", "/utf-8"]
+            if sys.platform == "win32"
+            else ["-std=c17"],
+        )
+    ],
+)

package/src/grammar.json

@@ -35,9 +35,21 @@
         ]
       }
     },
-    "line_ending": {
-      "type": "PATTERN",
-      "value": "\\r?\\n"
+    "_unmatchable": {
+      "type": "TOKEN",
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "PATTERN",
+            "value": "[\\s\\S]"
+          },
+          {
+            "type": "PATTERN",
+            "value": "[^\\s\\S]"
+          }
+        ]
+      }
     },
     "_end": {
       "type": "SEQ",
@@ -1680,7 +1692,12 @@
       "value": "invalid_syntax"
     }
   },
-  "extras": [],
+  "extras": [
+    {
+      "type": "SYMBOL",
+      "name": "_unmatchable"
+    }
+  ],
   "conflicts": [],
   "precedences": [],
   "externals": [
@@ -1708,6 +1725,10 @@
       "type": "SYMBOL",
       "name": "_eof"
     },
+    {
+      "type": "SYMBOL",
+      "name": "line_ending"
+    },
     {
       "type": "SYMBOL",
       "name": "_layout"