@gram-data/tree-sitter-gram 0.2.7 → 0.3.3

package/bindings/node/binding_test.js

@@ -7,3 +7,31 @@ test("can load grammar", () => {
   const parser = new (require("tree-sitter"))();
   assert.doesNotThrow(() => parser.setLanguage(require(".")));
 });
+
+test("annotation node kinds: identified_annotation and property_annotation", () => {
+  const Parser = require("tree-sitter");
+  const GramLang = require(".");
+  const parser = new Parser();
+  parser.setLanguage(GramLang);
+
+  const annotated = (root) => root.child(0) ?? null;
+
+  const withIdentified = parser.parse("@@p (a)");
+  const ap1 = annotated(withIdentified.rootNode);
+  assert(ap1?.type === "annotated_pattern", "root should have annotated_pattern child");
+  const annotations1 = ap1.childForFieldName("annotations");
+  assert(annotations1, "annotations node should exist");
+  const first1 = annotations1.child(0);
+  assert.strictEqual(first1?.type, "identified_annotation", "@@ form should be identified_annotation");
+  assert(first1?.childForFieldName("identifier"), "identified_annotation should have identifier field");
+
+  const withProperty = parser.parse("@x(1) ()");
+  const ap2 = annotated(withProperty.rootNode);
+  assert(ap2?.type === "annotated_pattern", "root should have annotated_pattern child");
+  const annotations2 = ap2.childForFieldName("annotations");
+  assert(annotations2, "annotations node should exist");
+  const first2 = annotations2.child(0);
+  assert.strictEqual(first2?.type, "property_annotation", "@ form should be property_annotation");
+  assert(first2?.childForFieldName("key"), "property_annotation should have key field");
+  assert(first2?.childForFieldName("value"), "property_annotation should have value field");
+});

package/editors/zed/extension.toml

@@ -1,6 +1,6 @@
 id = "gram"
 name = "Gram Language Support"
-version = "0.2.7"
+version = "0.3.3"
 schema_version = 1
 authors = ["Gram Data Contributors"]
 description = "Support for Gram notation - a subject-oriented notation for structured data"
@@ -8,4 +8,4 @@ description = "Support for Gram notation - a subject-oriented notation for struc
 # path = "grammars/tree-sitter-gram"
 [grammars.gram]
 repository = "https://github.com/gram-data/tree-sitter-gram"
-rev = "a702c249d589daca07380db66c54bcf497d71a38"
+rev = "78fba591ce4e3ca86ae77c871cfc9e87205c8e2b"

package/editors/zed/languages/gram/highlights.scm

@@ -46,8 +46,10 @@
 (map_entry key: (string_literal) @property)
 (map_entry key: (integer) @property)
 
-; Annotation keys
-(annotation key: (symbol) @attribute)
+; Annotation keys (property-style) and headers (identified/label-style)
+(property_annotation key: (symbol) @attribute)
+(identified_annotation identifier: (_) @attribute)
+(identified_annotation labels: (_) @attribute)
 
 ; Subject Pattern notation (special highlighting)
 (subject_pattern) @type

package/grammar.js

@@ -13,11 +13,9 @@ module.exports = grammar({
 
     annotated_pattern: ($) =>
       seq(
-        // field("annotations", optional($.annotations)),
         field("annotations", $.annotations),
         field("elements", choice($.subject_pattern, $._path_pattern)),
       ),
-    // _annotated_pattern_element: ($) => choice($.subject_pattern, $._path_pattern),
 
     subject_pattern: ($) =>
       seq(
@@ -31,11 +29,28 @@ module.exports = grammar({
 
     _subject_pattern_element: ($) => choice($.subject_pattern, $._path_pattern, $.pattern_reference),
 
-    annotations: ($) => repeat1($.annotation),
+    annotations: ($) =>
+      choice(
+        seq($.identified_annotation, repeat($.property_annotation)),
+        repeat1($.property_annotation),
+      ),
 
-    annotation: ($) =>
+    property_annotation: ($) =>
       seq("@", field("key", $.symbol), "(", field("value", $._value), ")"),
 
+    identified_annotation: ($) =>
+      seq(
+        "@@",
+        choice(
+          field("identifier", $._identifier),
+          field("labels", $.labels),
+          seq(
+            field("identifier", $._identifier),
+            field("labels", $.labels),
+          ),
+        ),
+      ),
+
     _path_pattern: ($) => choice($.relationship_pattern, $.node_pattern),
 
     node_pattern: ($) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gram-data/tree-sitter-gram",
-  "version": "0.2.7",
+  "version": "0.3.3",
   "description": "subject-oriented notation for structured data",
   "homepage": "https://gram-data.github.io",
   "repository": {
@@ -12,6 +12,7 @@
   "scripts": {
     "install": "node-gyp-build",
     "prestart": "tree-sitter build --wasm",
+    "build": "tree-sitter build --wasm",
     "start": "tree-sitter playground",
     "test": "node --test bindings/node/*_test.js",
     "zed:dev": "ZED_REPO_MODE=dev bash scripts/prepare-zed-extension.sh",
@@ -28,12 +29,14 @@
   ],
   "files": [
     "grammar.js",
+    "tree-sitter.json",
     "binding.gyp",
     "prebuilds/**",
     "bindings/node/*",
     "queries/*",
     "src/**",
-    "editors/**"
+    "editors/**",
+    "*.wasm"
   ],
   "author": "",
   "license": "ISC",
@@ -51,8 +54,8 @@
   },
   "devDependencies": {
     "eslint": "^9.37.0",
-    "node-gyp": "^11.4.2",
     "prebuildify": "^6.0.1",
-    "tree-sitter-cli": "^0.25.10"
+    "tree-sitter": "^0.25.0",
+    "tree-sitter-cli": "^0.26.5"
   }
 }

package/queries/highlights.scm

@@ -46,8 +46,10 @@
 (map_entry key: (string_literal) @property)
 (map_entry key: (integer) @property)
 
-; Annotation keys
-(annotation key: (symbol) @attribute)
+; Annotation keys (property-style) and headers (identified/label-style)
+(property_annotation key: (symbol) @attribute)
+(identified_annotation identifier: (_) @attribute)
+(identified_annotation labels: (_) @attribute)
 
 ; Subject Pattern notation (special highlighting)
 (subject_pattern) @type

package/src/grammar.json

@@ -178,13 +178,34 @@
       ]
     },
     "annotations": {
-      "type": "REPEAT1",
-      "content": {
-        "type": "SYMBOL",
-        "name": "annotation"
-      }
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "identified_annotation"
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "property_annotation"
+              }
+            }
+          ]
+        },
+        {
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "property_annotation"
+          }
+        }
+      ]
     },
-    "annotation": {
+    "property_annotation": {
       "type": "SEQ",
       "members": [
         {
@@ -217,6 +238,57 @@
         }
       ]
     },
+    "identified_annotation": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "@@"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "identifier",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_identifier"
+              }
+            },
+            {
+              "type": "FIELD",
+              "name": "labels",
+              "content": {
+                "type": "SYMBOL",
+                "name": "labels"
+              }
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "identifier",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_identifier"
+                  }
+                },
+                {
+                  "type": "FIELD",
+                  "name": "labels",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "labels"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
     "_path_pattern": {
       "type": "CHOICE",
       "members": [

package/src/node-types.json

@@ -33,76 +33,6 @@
       }
     }
   },
-  {
-    "type": "annotation",
-    "named": true,
-    "fields": {
-      "key": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "symbol",
-            "named": true
-          }
-        ]
-      },
-      "value": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "array",
-            "named": true
-          },
-          {
-            "type": "boolean_literal",
-            "named": true
-          },
-          {
-            "type": "decimal",
-            "named": true
-          },
-          {
-            "type": "hexadecimal",
-            "named": true
-          },
-          {
-            "type": "integer",
-            "named": true
-          },
-          {
-            "type": "map",
-            "named": true
-          },
-          {
-            "type": "measurement",
-            "named": true
-          },
-          {
-            "type": "octal",
-            "named": true
-          },
-          {
-            "type": "range",
-            "named": true
-          },
-          {
-            "type": "string_literal",
-            "named": true
-          },
-          {
-            "type": "symbol",
-            "named": true
-          },
-          {
-            "type": "tagged_string",
-            "named": true
-          }
-        ]
-      }
-    }
-  },
   {
     "type": "annotations",
     "named": true,
@@ -112,7 +42,11 @@
       "required": true,
       "types": [
         {
-          "type": "annotation",
+          "type": "identified_annotation",
+          "named": true
+        },
+        {
+          "type": "property_annotation",
           "named": true
         }
       ]
@@ -283,6 +217,40 @@
       ]
     }
   },
+  {
+    "type": "identified_annotation",
+    "named": true,
+    "fields": {
+      "identifier": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "integer",
+            "named": true
+          },
+          {
+            "type": "string_literal",
+            "named": true
+          },
+          {
+            "type": "symbol",
+            "named": true
+          }
+        ]
+      },
+      "labels": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "labels",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "labels",
     "named": true,
@@ -547,6 +515,76 @@
       }
     }
   },
+  {
+    "type": "property_annotation",
+    "named": true,
+    "fields": {
+      "key": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "symbol",
+            "named": true
+          }
+        ]
+      },
+      "value": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "array",
+            "named": true
+          },
+          {
+            "type": "boolean_literal",
+            "named": true
+          },
+          {
+            "type": "decimal",
+            "named": true
+          },
+          {
+            "type": "hexadecimal",
+            "named": true
+          },
+          {
+            "type": "integer",
+            "named": true
+          },
+          {
+            "type": "map",
+            "named": true
+          },
+          {
+            "type": "measurement",
+            "named": true
+          },
+          {
+            "type": "octal",
+            "named": true
+          },
+          {
+            "type": "range",
+            "named": true
+          },
+          {
+            "type": "string_literal",
+            "named": true
+          },
+          {
+            "type": "symbol",
+            "named": true
+          },
+          {
+            "type": "tagged_string",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "range",
     "named": true,
@@ -1115,6 +1153,10 @@
     "type": "@",
     "named": false
   },
+  {
+    "type": "@@",
+    "named": false
+  },
   {
     "type": "[",
     "named": false