npm - @konomanoasa/tree-sitter-query - Versions diffs - 0.1.0 → 0.3.0 - Mend

@konomanoasa/tree-sitter-query 0.1.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/Cargo.toml CHANGED Viewed

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

package/README.md CHANGED Viewed

@@ -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

package/grammar.js CHANGED Viewed

@@ -1,4 +1,4 @@
-const name = /[A-Za-z0-9_-][A-Za-z0-9_.-]*/;
+const namePattern = /[A-Za-z0-9_-][A-Za-z0-9_.-]*/;
 const stringContent = /[^"\\\n]+/;
 const postfixed = ($, body) =>
@@ -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",
@@ -52,10 +51,12 @@ export default grammar({
   name: "query",
   extras: ($) => [/[ \t\r\n\v\f]/, $.comment],
   rules: {
-    query: ($) => repeat($._member),
+    query: ($) => optional($._members),
+    _members: ($) => seq($._member, optional($._members)),
     _member: ($) => choice($._child_pattern, $._call),
-    _call_only_member: ($) => choice($._call_only_child_pattern, $._call),
     _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 +66,16 @@ 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),
+    _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_pattern: ($) =>
       seq(
         "(",
@@ -95,20 +103,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: ($) =>
       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,6 +123,7 @@ export default grammar({
         ),
       ),
     _missing_supertype: ($) => subtyped($, $._name),
     group: ($) =>
       seq(
         "(",
@@ -135,6 +138,7 @@ export default grammar({
         repeat(anchored($, $._member)),
         ")",
       ),
+    _group_pattern: ($) => postfixed($, choice($._delimited, $.string)),
     _call_only_group: ($) =>
       seq(
         "(",
@@ -144,6 +148,7 @@ export default grammar({
       ),
     _call_only_group_start: ($) =>
       choice($._call, alias($._call_only_pattern, $.pattern)),
     alternation: ($) =>
       seq(
         "[",
@@ -153,30 +158,35 @@ 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,
+    identifier: () => namePattern,
     _field_identifier: () => /[A-Za-z0-9-][A-Za-z0-9_.-]*/,
-    _immediate_identifier: () => token.immediate(name),
+    _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]/)),
     string_content: () =>
       token.immediate(
         prec(
@@ -184,8 +194,9 @@ export default grammar({
           repeat1(choice(stringContent, seq("\0", optional(stringContent)))),
         ),
       ),
-    // Distinct NUL transitions prevent the generated lexer from treating it as EOF.
+    // Keep NUL distinct from EOF in the generated lexer.
     escape_sequence: () => token.immediate(choice(/\\(.|\n)/, prec(1, "\\\0"))),
     comment: () => /;[^\r\n]*(\r+[^\r\n]+)*/,
   },
 });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@konomanoasa/tree-sitter-query",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "Tree-sitter grammar for Tree-sitter Query.",
   "license": "MIT",
@@ -21,11 +21,11 @@
   },
   "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",
@@ -35,7 +35,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 CHANGED Viewed

@@ -3,31 +3,44 @@
   "name": "query",
   "rules": {
     "query": {
-      "type": "REPEAT",
-      "content": {
-        "type": "SYMBOL",
-        "name": "_member"
-      }
-    },
-    "_member": {
       "type": "CHOICE",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "_child_pattern"
+          "name": "_members"
         },
+        {
+          "type": "BLANK"
+        }
+      ]
+    },
+    "_members": {
+      "type": "SEQ",
+      "members": [
         {
           "type": "SYMBOL",
-          "name": "_call"
+          "name": "_member"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_members"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
-    "_call_only_member": {
+    "_member": {
       "type": "CHOICE",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "_call_only_child_pattern"
+          "name": "_child_pattern"
         },
         {
           "type": "SYMBOL",
@@ -48,6 +61,19 @@
         }
       ]
     },
+    "_call_only_member": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_call_only_child_pattern"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_call"
+        }
+      ]
+    },
     "pattern": {
       "type": "SEQ",
       "members": [
@@ -154,66 +180,69 @@
         }
       ]
     },
-    "_group_pattern": {
-      "type": "SEQ",
+    "_delimited": {
+      "type": "CHOICE",
       "members": [
         {
-          "type": "FIELD",
-          "name": "body",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_delimited"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "string"
-              }
-            ]
-          }
+          "type": "SYMBOL",
+          "name": "node_pattern"
         },
         {
-          "type": "REPEAT",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "FIELD",
-                "name": "capture",
-                "content": {
-                  "type": "SYMBOL",
-                  "name": "capture"
-                }
-              },
-              {
-                "type": "FIELD",
-                "name": "quantifier",
-                "content": {
-                  "type": "SYMBOL",
-                  "name": "quantifier"
-                }
-              }
-            ]
-          }
+          "type": "SYMBOL",
+          "name": "group"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "alternation"
         }
       ]
     },
-    "_delimited": {
+    "_child_pattern": {
       "type": "CHOICE",
       "members": [
         {
           "type": "SYMBOL",
-          "name": "node_pattern"
+          "name": "_matching_child_pattern"
         },
         {
           "type": "SYMBOL",
-          "name": "group"
+          "name": "_call_only_child_pattern"
+        }
+      ]
+    },
+    "_matching_child_pattern": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "pattern"
         },
         {
           "type": "SYMBOL",
-          "name": "alternation"
+          "name": "field_constraint"
+        }
+      ]
+    },
+    "_call_only_child_pattern": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_call_only_pattern"
+          },
+          "named": true,
+          "value": "pattern"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_call_only_field_constraint"
+          },
+          "named": true,
+          "value": "field_constraint"
         }
       ]
     },
@@ -364,55 +393,6 @@
         }
       ]
     },
-    "_child_pattern": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_matching_child_pattern"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_call_only_child_pattern"
-        }
-      ]
-    },
-    "_matching_child_pattern": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "pattern"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "field_constraint"
-        }
-      ]
-    },
-    "_call_only_child_pattern": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_call_only_pattern"
-          },
-          "named": true,
-          "value": "pattern"
-        },
-        {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_call_only_field_constraint"
-          },
-          "named": true,
-          "value": "field_constraint"
-        }
-      ]
-    },
     "_node_annotation": {
       "type": "CHOICE",
       "members": [
@@ -800,6 +780,52 @@
         }
       ]
     },
+    "_group_pattern": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_delimited"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "string"
+              }
+            ]
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "capture",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "capture"
+                }
+              },
+              {
+                "type": "FIELD",
+                "name": "quantifier",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "quantifier"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    },
     "_call_only_group": {
       "type": "SEQ",
       "members": [
@@ -934,6 +960,10 @@
       "type": "STRING",
       "value": "."
     },
+    "wildcard": {
+      "type": "STRING",
+      "value": "_"
+    },
     "capture": {
       "type": "SEQ",
       "members": [
@@ -1120,10 +1150,6 @@
         }
       ]
     },
-    "wildcard": {
-      "type": "STRING",
-      "value": "_"
-    },
     "string": {
       "type": "SEQ",
       "members": [
@@ -1173,14 +1199,55 @@
           }
         },
         {
-          "type": "IMMEDIATE_TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "\""
-          }
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "IMMEDIATE_TOKEN",
+              "content": {
+                "type": "STRING",
+                "value": "\""
+              }
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_string_line_break"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_unmatchable"
+                }
+              ]
+            }
+          ]
         }
       ]
     },
+    "_string_line_break": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "\\n"
+      }
+    },
+    "_unmatchable": {
+      "type": "TOKEN",
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "\\"
+          },
+          {
+            "type": "PATTERN",
+            "value": "[^\\s\\S]"
+          }
+        ]
+      }
+    },
     "string_content": {
       "type": "IMMEDIATE_TOKEN",
       "content": {

package/src/node-types.json CHANGED Viewed

@@ -5,7 +5,7 @@
     "fields": {},
     "children": {
       "multiple": true,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "directive",