@konomanoasa/tree-sitter-query 0.2.0 → 0.3.1

package/Cargo.toml

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

package/README.md

@@ -15,7 +15,7 @@ npm install @konomanoasa/tree-sitter-query
 
 ## Development
 
-Development uses Node.js 24 or later.
+Development uses Node.js 24.21.0 or later.
 
 ```sh
 npm install
@@ -29,6 +29,10 @@ npm test
 - [Tree-sitter query operators](https://tree-sitter.github.io/tree-sitter/using-parsers/queries/2-operators.html)
 - [Tree-sitter query predicates and directives](https://tree-sitter.github.io/tree-sitter/using-parsers/queries/3-predicates-and-directives.html)
 
+## Used By
+
+[query-ts-mode](https://github.com/konomanoasa/query-ts-mode): Emacs major mode.
+
 ## License
 
 [MIT](LICENSE)

package/grammar.js

@@ -1,5 +1,5 @@
-const name = /[A-Za-z0-9_-][A-Za-z0-9_.-]*/;
-const stringContent = /[^"\\\n]+/;
+const namePattern = /[A-Za-z0-9_-][A-Za-z0-9_.-]*/;
+const fieldNamePattern = /[A-Za-z0-9-][A-Za-z0-9_.-]*/;
 
 const postfixed = ($, body) =>
   seq(
@@ -24,10 +24,9 @@ const fieldConstraint = ($, target) =>
     field("pattern", target),
   );
 
-// The Query API accepts no layout or comment around the subtype separator.
-const subtyped = ($, name) =>
+const subtyped = ($, supertype) =>
   seq(
-    field("supertype", name),
+    field("supertype", supertype),
     token.immediate("/"),
     field(
       "subtype",
@@ -38,6 +37,9 @@ const subtyped = ($, name) =>
     ),
   );
 
+const callOnlyGroupMembers = ($) =>
+  seq($._call_only_group_start, repeat(anchored($, $._call_only_member)));
+
 const call = ($, marker) =>
   seq(
     "(",
@@ -52,10 +54,12 @@ export default grammar({
   name: "query",
   extras: ($) => [/[ \t\r\n\v\f]/, $.comment],
   rules: {
-    query: ($) => repeat($._member),
-    _member: ($) => choice($._child_pattern, $._call),
-    _call_only_member: ($) => choice($._call_only_child_pattern, $._call),
+    query: ($) => optional($._members),
+    _members: ($) => seq($._member, optional($._members)),
+    _member: ($) => choice($._matching_child_pattern, $._call_only_member),
     _call: ($) => choice($.predicate, $.directive),
+    _call_only_member: ($) => choice($._call_only_child_pattern, $._call),
+
     pattern: ($) => postfixed($, choice($._delimited, $.string, $.wildcard)),
     _call_only_pattern: ($) =>
       postfixed(
@@ -65,9 +69,14 @@ export default grammar({
           alias($._call_only_alternation, $.alternation),
         ),
       ),
-    // "(_" always opens a node pattern, so a group never starts with a bare wildcard.
-    _group_pattern: ($) => postfixed($, choice($._delimited, $.string)),
     _delimited: ($) => choice($.node_pattern, $.group, $.alternation),
+    _matching_child_pattern: ($) => choice($.pattern, $.field_constraint),
+    _call_only_child_pattern: ($) =>
+      choice(
+        alias($._call_only_pattern, $.pattern),
+        alias($._call_only_field_constraint, $.field_constraint),
+      ),
+
     node_pattern: ($) =>
       seq(
         "(",
@@ -78,13 +87,13 @@ export default grammar({
               "node",
               choice($.identifier, $.wildcard, $.supertype, $.missing_node),
             ),
-            repeat($._node_annotation),
+            repeat($._non_matching_child),
             optional(
               seq(
                 anchored($, $._matching_child_pattern),
                 repeat(
                   choice(
-                    $._node_annotation,
+                    $._non_matching_child,
                     anchored($, $._matching_child_pattern),
                   ),
                 ),
@@ -95,20 +104,14 @@ export default grammar({
         ),
         ")",
       ),
-    _child_pattern: ($) =>
-      choice($._matching_child_pattern, $._call_only_child_pattern),
-    _matching_child_pattern: ($) => choice($.pattern, $.field_constraint),
-    _call_only_child_pattern: ($) =>
-      choice(
-        alias($._call_only_pattern, $.pattern),
-        alias($._call_only_field_constraint, $.field_constraint),
-      ),
-    _node_annotation: ($) =>
+    _non_matching_child: ($) =>
       choice(anchored($, $._call_only_member), $.negated_field),
+
     field_constraint: ($) => fieldConstraint($, $._matching_child_pattern),
     _call_only_field_constraint: ($) =>
       fieldConstraint($, $._call_only_child_pattern),
     negated_field: ($) => seq("!", field("name", $._name)),
+
     supertype: ($) =>
       subtyped($, choice($.identifier, alias($.wildcard, $.identifier))),
     _untyped_missing_node: () => "MISSING",
@@ -121,29 +124,22 @@ export default grammar({
         ),
       ),
     _missing_supertype: ($) => subtyped($, $._name),
+
     group: ($) =>
       seq(
         "(",
         choice(
-          alias($._group_pattern, $.pattern),
-          seq(
-            $._call_only_group_start,
-            repeat(anchored($, $._call_only_member)),
-            anchored($, $._matching_child_pattern),
-          ),
+          alias($._group_start_pattern, $.pattern),
+          seq(callOnlyGroupMembers($), anchored($, $._matching_child_pattern)),
         ),
         repeat(anchored($, $._member)),
         ")",
       ),
-    _call_only_group: ($) =>
-      seq(
-        "(",
-        $._call_only_group_start,
-        repeat(anchored($, $._call_only_member)),
-        ")",
-      ),
+    _group_start_pattern: ($) => postfixed($, choice($._delimited, $.string)),
+    _call_only_group: ($) => seq("(", callOnlyGroupMembers($), ")"),
     _call_only_group_start: ($) =>
       choice($._call, alias($._call_only_pattern, $.pattern)),
+
     alternation: ($) =>
       seq(
         "[",
@@ -153,39 +149,41 @@ export default grammar({
         "]",
       ),
     _call_only_alternation: ($) => seq("[", repeat1($._call_only_member), "]"),
+
     quantifier: () => token(choice("+", "*", "?")),
     anchor: () => ".",
+    wildcard: () => "_",
     capture: ($) =>
       seq("@", field("name", alias($._immediate_identifier, $.identifier))),
+
     predicate: ($) => call($, "?"),
     directive: ($) => call($, "!"),
-    identifier: () => name,
-    _field_identifier: () => /[A-Za-z0-9-][A-Za-z0-9_.-]*/,
-    _immediate_identifier: () => token.immediate(name),
+
+    identifier: () => namePattern,
+    _field_identifier: () => fieldNamePattern,
+    _immediate_identifier: () => token.immediate(namePattern),
     _name: ($) =>
       choice(
         $.identifier,
         alias($.wildcard, $.identifier),
         alias("MISSING", $.identifier),
       ),
-    wildcard: () => "_",
+
     string: ($) => seq('"', $._string_tail),
     _immediate_string: ($) => seq(token.immediate('"'), $._string_tail),
     _string_tail: ($) =>
       seq(
         repeat(choice($.string_content, $.escape_sequence)),
-        token.immediate('"'),
+        choice(token.immediate('"'), seq($._string_line_break, $._unmatchable)),
       ),
-    // Content outranks the comment extra so that ; stays inside the string.
+    _string_line_break: () => token.immediate(/\n/),
+    _unmatchable: () => token(seq("\\", /[^\s\S]/)),
+    // Keep NUL distinct from EOF in the generated lexer.
     string_content: () =>
-      token.immediate(
-        prec(
-          1,
-          repeat1(choice(stringContent, seq("\0", optional(stringContent)))),
-        ),
-      ),
-    // Distinct NUL transitions prevent the generated lexer from treating it as EOF.
-    escape_sequence: () => token.immediate(choice(/\\(.|\n)/, prec(1, "\\\0"))),
+      token.immediate(prec(1, repeat1(choice(/[^"\\\n]+/, "\0")))),
+    escape_sequence: () =>
+      token.immediate(seq("\\", choice(/.|\n/, prec(1, "\0")))),
+
     comment: () => /;[^\r\n]*(\r+[^\r\n]+)*/,
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konomanoasa/tree-sitter-query",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "Tree-sitter grammar for Tree-sitter Query.",
   "license": "MIT",
@@ -21,21 +21,22 @@
   },
   "scripts": {
     "build": "npm run tree-sitter -- build-all",
-    "check": "biome check . && node scripts/check-generated.js && npm test",
-    "format": "biome check --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",
     "tree-sitter": "node scripts/tree-sitter.js"
   },
   "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